代码整理

src/custom/service/GetOutCodeFromTQWms.java

@@ -94,14 +94,15 @@ public class GetOutCodeFromTQWms extends ServiceController {
                     TQWMS.runSqlUpdate("update TOutSerialnoDetail set status=1 where BillNo='" + billno + "' and SerialNo='" + sku + "'");
                     //判断关闭中间表状态
 
-                    Rows skucountRows = dbConnect.runSqlQuery("select sum(1) as skucount,sum(case when createby='wms' then 1 else 0 end ) as wmsskucount from st_stockbill_items_sku where st_stockbillid=" + st_stockbillid);
-                    Rows skuitemcountRows = dbConnect.runSqlQuery("select sum(qty) as totalcount,sum(case when t1.wmsuploadflag=2 then qty else 0 end ) as wmscount from st_stockbill_items t1 inner join plm_item t2 on t1.itemid=t2.itemid and t2.skucontrol=1 where  st_stockbillid=" + st_stockbillid);
+                    Rows skucountRows = dbConnect.runSqlQuery("select sum(1) as skucount,sum(case when createby='WMS' then 1 else 0 end ) as wmsskucount from st_stockbill_items_sku where st_stockbillid=" + st_stockbillid);
+                    Rows skuitemcountRows = dbConnect.runSqlQuery("select sum(qty) as totalcount,sum(case when t1.wmsuploadflag=2 then qty else 0 end ) as wmscount from st_stockbill_items t1 inner join plm_item t2 on t1.itemid=t2.itemid and t2.skucontrol=1 where t1.st_stockbillid=" + st_stockbillid);
                     if (skucountRows.isNotEmpty() && skuitemcountRows.isNotEmpty()) {
-                        int skucount = skucountRows.get(0).getInteger("skucount");
-                        int wmsskucount = skucountRows.get(0).getInteger("wmsskucount");
-                        int totalcount = skuitemcountRows.get(0).getInteger("totalcount");
-                        int wmscount = skuitemcountRows.get(0).getInteger("wmscount");
+                        int skucount = skucountRows.get(0).getInteger("skucount");//已收集的序列号数
+                        int wmsskucount = skucountRows.get(0).getInteger("wmsskucount");//从立库收集的序列号数
+                        int totalcount = skuitemcountRows.get(0).getInteger("totalcount");//出库总数
+                        int wmscount = skuitemcountRows.get(0).getInteger("wmscount");//已下发立库的总数
                         if (wmsskucount >= wmscount || totalcount >= skucount) {
+                            //当从立库收集的序列号数大于等于已下发立库的总数时或者出库总数大于等于已收集的序列号数时，表示本次立库收集完成
                             ArrayList<String> sqlist = new ArrayList<>();
                             sqlist.add("update TOutInt set status=10 ,ModifyDate=getdate() where BillNo='" + billno + "'");
                             sqlist.add("update TOutDetailInt set status=10,ModifyDate=getdate() where BillNo='" + billno + "'");