商品档案添加字段stockno及订单表体添加总未发量

src/custom/restcontroller/sale/item/SQL/查询商品列表.sql

@@ -33,7 +33,8 @@ SELECT t1.itemid,
        t8.prodline,
        t8.device,
        t9.sa_itemgroupid,
-       t1.marketprice
+       t1.marketprice,
+       t1.stockno
 FROM plm_item t1
          LEFT JOIN plm_unit t2
                    ON t2.unitid = t1.unitid AND t2.siteid = t1.siteid

src/custom/restcontroller/webmanage/sale/item/Item.java

@@ -158,6 +158,7 @@ public class Item extends Controller {
 
         sqlFactory.addParameter("sa_customschemeid", content.getLongValue("sa_customschemeid"));
         sqlFactory.addParameter("financeclasstype", content.getStringValue("financeclasstype"));
+        sqlFactory.addParameter("stockno", content.getStringValue("stockno"));
 
         sqlList.add(sqlFactory.getSQL());
         // 货品档案扩展属性字段表

src/custom/restcontroller/webmanage/sale/item/SQL/货品档案列表.sql

@@ -29,6 +29,7 @@ SELECT t1.itemid,
        t1.color,
        t1.cheek,
        t1.delistingstatus,
+       t1.stockno,
        t6.auxunitid,
        t6.unitgroupname,
        t7.unitname axunitname,

src/custom/restcontroller/webmanage/sale/item/SQL/货品档案新增.sql

@@ -2,9 +2,9 @@ insert into plm_item (siteid, itemid, createby, createdate, changeuserid, change
                       isauxunit, unitgroupid, itemname, isonsale, status, model, spec, orderminqty, orderaddqty,
                       orderminqty_auxunit, orderaddqty_auxunit, remarks, barcode, skucontrol, batchcontrol, grossweight,
                       weight, height, width, length, delivery, istool, marketprice, standards, stockstatus2,
-                      stockstatus1, warrantyday, iswuliao, isservice,color,packageqty,ismodule,iswoodproducts,sa_customschemeid,cheek,delistingstatus,financeclasstype)
+                      stockstatus1, warrantyday, iswuliao, isservice,color,packageqty,ismodule,iswoodproducts,sa_customschemeid,cheek,delistingstatus,financeclasstype,stockno)
 values ($siteid$, $itemid$, $username$, CURRENT_TIME, $userid$, $username$, CURRENT_TIME, $itemno$, $unitid$,
         $isauxunit$, $unitgroupid$, $itemname$, $isonsale$, '新建', $model$, $spec$, $orderminqty$, $orderaddqty$,
         $orderminqty_auxunit$, $orderaddqty_auxunit$, $remarks$, $barcode$, $skucontrol$, $batchcontrol$, $grossweight$,
         $weight$, $height$, $width$, $length$, $delivery$, $istool$, $marketprice$, $standards$,
-        $stockstatus2$, $stockstatus1$, $warrantyday$, $iswuliao$, $isservice$,$color$,$packageqty$,$ismodule$,$iswoodproducts$,$sa_customschemeid$,$cheek$,$delistingstatus$,$financeclasstype$)
+        $stockstatus2$, $stockstatus1$, $warrantyday$, $iswuliao$, $isservice$,$color$,$packageqty$,$ismodule$,$iswoodproducts$,$sa_customschemeid$,$cheek$,$delistingstatus$,$financeclasstype$,$stockno$)

src/custom/restcontroller/webmanage/sale/item/SQL/货品档案更新.sql

@@ -39,7 +39,8 @@ SET changeuserid=$userid$,
     iswoodproducts=$iswoodproducts$,
     isservice = $isservice$,
     sa_customschemeid=$sa_customschemeid$,
-    financeclasstype=$financeclasstype$
+    financeclasstype=$financeclasstype$,
+    stockno=$stockno$
 WHERE itemid = $itemid$
   and siteid = $siteid$
 

src/custom/restcontroller/webmanage/sale/order/OrderItems.java

@@ -440,6 +440,11 @@ public class OrderItems extends Controller {
         Rows sumQtyRows = dbConnect.runSqlQuery(sqlFactory1);
         RowsMap sumQtyRowsMap = sumQtyRows.toRowsMap("itemno");
 
+        SQLFactory sqlFactory2 =new SQLFactory(this,"商品未发货数量汇总");
+        sqlFactory2.addParameter("siteid", siteid);
+        Rows sumUnQtyRows = dbConnect.runSqlQuery(sqlFactory2);
+        RowsMap sumUnQtyRowsMap= sumUnQtyRows.toRowsMap("itemno");
+
         ERPDocking erpDocking = new ERPDocking();
         JSONArray jsonArray = new JSONArray();
         if (rows.toJsonArray("itemno").size() != 0) {
@@ -466,6 +471,11 @@ public class OrderItems extends Controller {
             } else {
                 row.put("unsoldqty", BigDecimal.ZERO);
             }
+            if(sumUnQtyRowsMap.get(row.getString("itemno")).isNotEmpty()){
+                row.put("undeliqtysum", sumUnQtyRowsMap.get(row.getString("itemno")).get(0).getBigDecimal("undeliqty"));
+            }else {
+                row.put("undeliqtysum", BigDecimal.ZERO);
+            }
             if (!row.containsKey("invbalqty")) {
                 row.put("invbalqty", BigDecimal.ZERO);
             }
@@ -535,6 +545,11 @@ public class OrderItems extends Controller {
         Rows sumQtyRows = dbConnect.runSqlQuery(sqlFactory1);
         RowsMap sumQtyRowsMap = sumQtyRows.toRowsMap("itemno");
 
+        SQLFactory sqlFactory2 =new SQLFactory(this,"商品未发货数量汇总");
+        sqlFactory2.addParameter("siteid", siteid);
+        Rows sumUnQtyRows = dbConnect.runSqlQuery(sqlFactory2);
+        RowsMap sumUnQtyRowsMap= sumUnQtyRows.toRowsMap("itemno");
+
         ERPDocking erpDocking = new ERPDocking();
         JSONArray jsonArray = new JSONArray();
         if (rows.toJsonArray("itemno").size() != 0) {
@@ -561,6 +576,11 @@ public class OrderItems extends Controller {
             } else {
                 row.put("unsoldqty", BigDecimal.ZERO);
             }
+            if(sumUnQtyRowsMap.get(row.getString("itemno")).isNotEmpty()){
+                row.put("undeliqtysum", sumUnQtyRowsMap.get(row.getString("itemno")).get(0).getBigDecimal("undeliqty"));
+            }else {
+                row.put("undeliqtysum", BigDecimal.ZERO);
+            }
             if (!row.containsKey("invbalqty")) {
                 row.put("invbalqty", BigDecimal.ZERO);
             }

src/custom/restcontroller/webmanage/sale/order/SQL/商品未发货数量汇总.sql

@@ -0,0 +1,8 @@
+SELECT t1.itemno,
+       sum(t1.undeliqty) undeliqty
+FROM sa_orderitems t1
+         inner join plm_item t2 on t1.siteid = t2.siteid and t1.itemid = t2.itemid
+         inner join sa_order t3 on t1.siteid=t3.siteid and t1.sa_orderid=t3.sa_orderid
+         left join plm_unit t4 on t2.unitid=t4.unitid and t2.siteid=t4.siteid
+WHERE t3.STATUS in ('提交','审核')
+and  t1.siteid=$siteid$ group by t1.itemno

src/custom/service/AutoDockItemService.java

@@ -120,6 +120,7 @@ public class AutoDockItemService extends ServiceController {
 
                     sqlFactory.addParameter("sa_customschemeid", 0);
                     sqlFactory.addParameter("financeclasstype", jsonObject.getStringValue("fdescription"));
+                    sqlFactory.addParameter("stockno", "01");
 
                     sqlList.add(sqlFactory.getSQL());
                     // 货品档案扩展属性字段表