|
@@ -8,6 +8,7 @@ import beans.remind.Remind;
|
|
import beans.report.Report;
|
|
import beans.report.Report;
|
|
import com.alibaba.fastjson.JSONArray;
|
|
import com.alibaba.fastjson.JSONArray;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
|
+import com.sun.codemodel.internal.JForEach;
|
|
import common.Controller;
|
|
import common.Controller;
|
|
import common.YosException;
|
|
import common.YosException;
|
|
import common.annotation.API;
|
|
import common.annotation.API;
|
|
@@ -776,6 +777,19 @@ public class dispatch extends Controller {
|
|
if (!erpDocking.getUrl().isEmpty()) {
|
|
if (!erpDocking.getUrl().isEmpty()) {
|
|
JSONArray jsonArray = erpDocking.getErpIcinvbalRows(200000, 1, rowsDispatchDetail.toJsonArray("itemno"));
|
|
JSONArray jsonArray = erpDocking.getErpIcinvbalRows(200000, 1, rowsDispatchDetail.toJsonArray("itemno"));
|
|
|
|
|
|
|
|
+ Rows rowsDispatchDetailBatchno = dbConnect.runSqlQuery("select t2.itemno,t1.batchno from sa_dispatch_items t1 inner join plm_item t2 on t1.itemid=t2.itemid and t1.siteid=t2.siteid where t1.batchno!='' and t1.sa_dispatchid=" + sa_dispatchid);
|
|
|
|
+
|
|
|
|
+ for(Row row :rowsDispatchDetailBatchno){
|
|
|
|
+ JSONArray jsonArray1 =new JSONArray();
|
|
|
|
+ jsonArray1.add(row.getString("itemno"));
|
|
|
|
+ JSONArray jsonArrayBatch = erpDocking.getErpIcinvbalBatchRowsforbatchno(20000, 1, jsonArray1,row.getString("batchno"));
|
|
|
|
+ if(jsonArrayBatch.isEmpty()){
|
|
|
|
+ return getErrReturnObject().setErrMsg(row.getString("itemno")+"批号有误,请重新选择!!")
|
|
|
|
+ .toString();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+
|
|
SQLFactory sqlFactory1 = new SQLFactory(this, "商品发货数量汇总");
|
|
SQLFactory sqlFactory1 = new SQLFactory(this, "商品发货数量汇总");
|
|
sqlFactory1.addParameter("siteid", siteid);
|
|
sqlFactory1.addParameter("siteid", siteid);
|
|
sqlFactory1.addParameter_in("itemno", rowsDispatchDetail.toArrayList("itemno", new ArrayList<>()));
|
|
sqlFactory1.addParameter_in("itemno", rowsDispatchDetail.toArrayList("itemno", new ArrayList<>()));
|