Преглед на файлове

发货通知单批号可根据商品明细及行关闭功能

hu преди 1 година
родител
ревизия
23ff600044

+ 0 - 3
src/custom/restcontroller/webmanage/sale/dispatch/dispatch.java

@@ -555,9 +555,6 @@ public class dispatch extends Controller {
     @API(title = "行关闭", apiversion = R.ID20230522093703.v1.class)
     @CACHEING_CLEAN(apiClass = {Order.class, OrderItems.class, restcontroller.sale.order.Order.class, dispatch.class, dispatchItems.class, cashbill.class})
     public String closeRows() throws YosException {
-        //通过版本更新发货单表头数据
-        Dispatch.updateDispatchWithVersion(this);
-
         JSONArray sa_dispatch_itemsids = content.getJSONArray("sa_dispatch_itemsids");
         BatchDeleteErr batchDeleteErr = BatchDeleteErr.create(this, sa_dispatch_itemsids.size());
         String sql = "";

+ 9 - 2
src/custom/restcontroller/webmanage/sale/dispatch/dispatchItems.java

@@ -116,11 +116,18 @@ public class dispatchItems extends Controller {
     @API(title = "erp批次库存查询", apiversion = R.ID20230427101303.v1.class)
     @CACHEING
     public String queryErpIcinvbalBatchList() throws YosException {
-
+        BigDecimal qty =content.getBigDecimalValue("qty");
         JSONArray jsonArray = content.getJSONArray("itemnos");
+        JSONArray jsonArrayfinal=new JSONArray();
         ERPDocking erpDocking = new ERPDocking();
         JSONArray rows = erpDocking.getErpIcinvbalBatchRows(1000, 1, jsonArray);
-        return getSucReturnObject().setData(rows).toString();
+        for (Object object:rows) {
+            JSONObject jsonObject =(JSONObject) object;
+            if(jsonObject.getBigDecimalValue("fqty").compareTo(qty)>=0){
+                jsonArrayfinal.add(jsonObject);
+            }
+        }
+        return getSucReturnObject().setData(jsonArrayfinal).toString();
     }
 
     @API(title = "新建或修改发货单商品明细", apiversion = R.ID20221115104603.v1.class,intervaltime = 200)