序列号收集及序列号使用记录接口

src/custom/restcontroller/R.java

@@ -6761,6 +6761,11 @@ public class R {
         public static class v1 {
         }
     }
+
+    public static class ID2025101809551503 {
+        public static class v1 {
+        }
+    }
 }
 
 

src/custom/restcontroller/webmanage/sale/stockbill/stockbill.java

@@ -770,11 +770,11 @@ public class stockbill extends Controller {
 
         Rows rows = dbConnect.runSqlQuery("select t1.*,t2.stockno from st_stockbill t1 left join st_stock t2 on t1.stockid=t2.stockid where t1.st_stockbillid ='"
                 + st_stockbillid + "' and  t1.siteid='" + siteid + "'");
-        Rows stockbillitemsrows = dbConnect.runSqlQuery("select t1.*,t2.skucontrol from st_stockbill_items t1 left join plm_item t2 on t1.itemid=t2.itemid where t1.st_stockbillid ='"
-                + st_stockbillid + "' and  siteid='" + siteid + "'");
+        Rows stockbillitemsrows = dbConnect.runSqlQuery("select t1.itemid,t1.qty,t2.skucontrol from st_stockbill_items t1 left join plm_item t2 on t1.itemid=t2.itemid where t1.st_stockbillid ='"
+                + st_stockbillid + "' and  t1.siteid='" + siteid + "'");
         Rows stockbillitemskurows = dbConnect.runSqlQuery("select * from st_stockbill_items_sku where st_stockbillid ='"
                 + st_stockbillid + "' and  siteid='" + siteid + "'");
-        Rows skuRows = dbConnect.runSqlQuery("select t1.*,t2.itemno,t3.stockno from sa_itemsku t1 left join plm_item t2 on t1.itemid=t2.itemid left join st_stock t3 on t1.stockid=t3.st_stockid where t1.siteid='" + siteid + "'");
+        Rows skuRows = dbConnect.runSqlQuery("select t1.*,t2.itemno,t3.stockno from sa_itemsku t1 left join plm_item t2 on t1.itemid=t2.itemid left join st_stock t3 on t1.stockid=t3.stockid where t1.siteid='" + siteid + "'");
         RowsMap skuRowsMap = skuRows.toRowsMap("sku");
         if (rows.isEmpty()) {
             return getErrReturnObject().setErrMsg("该出入库单不存在")

src/custom/restcontroller/webmanage/sale/stockbill/stockbillitems.java

@@ -104,7 +104,9 @@ public class stockbillitems extends Controller {
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "plm_item",
                 "itemid","itemno","itemname","model","spec","batchcontrol","outplace","icaddqty","icminqty");
         querySQL.setTableAlias("t1");
+        querySQL.addJoinTable(JOINTYPE.left, "plm_unit", "t2", "t1.siteid = t2.siteid and t1.unitid = t2.unitid","unitname");
         querySQL.setSiteid(siteid);
+        querySQL.addQueryFields("qty","t1.icminqty");
         querySQL.setWhere("t1.STATUS = '审核' and t1.isused=1");
         querySQL.setWhere("t1.itemid not in (select itemid from st_stockbill_items where st_stockbillid='"+st_stockbillid+"')");
         //querySQL.setWhere("t1.sa_orderitemsid not in(select t1.sa_orderitemsid from (select t1.sa_orderitemsid,t1.siteid,SUM(t1.qty) qty from sa_dispatch_items t1 inner join sa_dispatch t2 on t1.sa_dispatchid=t2.sa_dispatchid and t1.siteid=t2.siteid where t2.status in('新建','提交') group by t1.sa_orderitemsid,t1.siteid) t1 inner join  sa_orderitems t3 on t1.sa_orderitemsid=t3.sa_orderitemsid and t1.siteid=t3.siteid where t3.undeliqty=t1.qty)");

src/custom/restcontroller/webmanage/sale/toolscode/toolscode.java

@@ -377,6 +377,19 @@ public class toolscode extends Controller {
         return getSucReturnObject().setData(rows).toString();
     }
 
+    @API(title = "查询序列号使用记录", apiversion = R.ID2025101809551503.v1.class)
+    public String querySkuUsedList() throws YosException {
+        String sku = content.getString("sku");
+        pageSorting="t1.billdate asc";
+        QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sku_use_view", "*");
+        querySQL.setTableAlias("t1");
+        querySQL.setPage(pageSize, pageNumber);
+        querySQL.setWhere("t1.sku", sku);
+        Rows rows = querySQL.query();
+        return getSucReturnObject().setData(rows).toString();
+    }
+
+
     @API(title = "删除", apiversion = R.ID20221215101103.v1.class)
     @CACHEING_CLEAN(apiversions = {R.ID20221215101003.v1.class, R.ID20221215100903.v1.class})
     public String delete() throws YosException {