Browse Source

发货计划明细订单信息刷新接口优化测试

hu 1 month ago
parent
commit
940ca58d98

+ 2 - 1
src/custom/restcontroller/webmanage/sale/accessoryorder/accessoryorder.java

@@ -356,7 +356,8 @@ public class accessoryorder extends Controller {
     //查询配件订单列表(管理端)
     public QuerySQL queryListManage(String where) throws YosException {
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_order",
-                "sa_orderid", "sonum", "type", "status", "submitdate", "checkdate", "remarks", "createby", "checkby", "billdate", "tradefield", "delivery", "tracknumber", "mailno","rec_contactsid");
+                "sa_orderid", "sonum", "type", "status", "submitdate", "checkdate", "remarks", "createby", "checkby", "billdate", "tradefield", "rec_contactsid", "delivery","logisticsmethod", "tracknumber", "mailno"
+                ,"invoicetaxno","invoicename","invoiceaddress","contact","address","phonenumber","province","city","county");
         querySQL.setTableAlias("t1");
         querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t2", "t2.sys_enterpriseid = t1.sys_enterpriseid and t2.siteid = t1.siteid",
                 "enterprisename");

+ 6 - 0
src/custom/restcontroller/webmanage/sale/sendplan/sendplandetail.java

@@ -103,10 +103,16 @@ public class sendplandetail extends Controller {
 
             if(row.getLong("itemid")==olditemid){
                 insertSQL.setValue("canuseqty", oldcanuseqty.subtract(oldsendqty));
+            }else{
+                insertSQL.setValue("canuseqty", canuseqty);
             }
             olditemid=row.getLong("itemid");
             oldcanuseqty=oldcanuseqty.subtract(oldsendqty);
             oldsendqty=sendqty;
+            if(row.getLong("itemid")!=olditemid){
+                oldcanuseqty=BigDecimal.ZERO;
+                oldsendqty=BigDecimal.ZERO;
+            }
             list.add(insertSQL.getSQL());
         }
         dbConnect.runSqlUpdate(list);