增加收料数量限制

src/main/java/com/uas/eis/service/Impl/MESServiceImpl.java

@@ -67,7 +67,7 @@ public class MESServiceImpl implements MESService {
         String whcode="";
         for (int i = 0; i <jsonArray.size() ; i++) {
             JSONObject jsonObject = JSON.parseObject(StringUtil.nvl(jsonArray.get(i), ""));
-            Object mesCode = StringUtil.nvl(jsonObject.get("mesCode"),"");
+            String mesCode = StringUtil.nvl(jsonObject.get("mesCode"),"");
             whcode= StringUtil.nvl(jsonObject.get("whNo"), "");
             if ("".equals(mesCode)){
                 return ApiResponse.failRsp("10011",request.getHeader("RequestId"),"ERP单据编号不能为空！");
@@ -107,6 +107,20 @@ public class MESServiceImpl implements MESService {
             }
             sellerName = StringUtil.nvl(jsonObject.get("sellerName"), "管理员");
         }
+        JSONArray array = data.get("detail");
+        for (int i = 0; i <array.size() ; i++) {
+            JSONObject json = JSON.parseObject(StringUtil.nvl(array.get(i), ""));
+            String itemNo = StringUtil.nvl(json.get("itemNo"), "");
+            Double qty = Double.parseDouble(StringUtil.nvl(json.get("qty"), "0"));
+            Double vadQty = baseDao.getSummaryByField("verifyapplydetail", "vad_qty", "vad_prodcode='" + itemNo + "' and vad_vaid=" + vaid);
+            int compare = qty.compareTo(vadQty);
+            if (compare>0){
+                return ApiResponse.failRsp("10017",request.getHeader("RequestId"),"收料数量："+qty+"超出ERP收料单数量："+vadQty+"，不允许入库！");
+            }
+            if (compare<0){
+                return ApiResponse.failRsp("10018",request.getHeader("RequestId"),"收料数量："+qty+"少于ERP收料单数量："+vadQty+"，不允许入库！");
+            }
+        }
         if ("".equals(whcode)){
             return ApiResponse.failRsp("10015",request.getHeader("RequestId"),"MES仓库编号不能为空！");
         }
@@ -210,10 +224,10 @@ public class MESServiceImpl implements MESService {
             code = baseDao.sGetMaxNumber("ProdInOut!Make!In", 2);
             sqls.add("insert into prodinout (pi_id,pi_inoutno,pi_class,pi_date,pi_statuscode,pi_status,pi_whcode,pi_whname,pi_departmentcode,pi_departmentname,pi_emcode,pi_emname,pi_invostatuscode,pi_invostatus,pi_recordman,pi_recorddate,pi_printstatuscode,pi_printstatus) values ("+id+",'"+code+"','完工入库单',to_date('"+jsonObject2.get("Fdate")+"','yyyy/MM/dd HH24:mi:ss'),'UNPOST'," + "'未过账','"+warehouses[0]+"','"+warehouses[1]+"','"+map5.get("FNumber")+"','"+map5.get("FName")+ "','"+map6.get("FNumber")+"','"+map7.get("FName")+"','ENTERING','在录入','"+map8.get("FName")+"',to_date('"+jsonObject2.get("Fdate")+"','yyyy-MM-dd HH24:mi:ss'),'UNPRINT','未打印')");
         }
-        JSONArray jsonArray1 = data.get("detail");
+        JSONArray array = data.get("detail");
         int detno=1;
-        for (int i = 0; i <jsonArray1.size() ; i++) {
-            Object obj = jsonArray1.get(i);
+        for (int i = 0; i <array.size() ; i++) {
+            Object obj = array.get(i);
             JSONObject jsonObject3 = JSON.parseObject(StringUtil.nvl(obj, ""));
             Map<Object, Object> map11 = JSONUtil.toMap(StringUtil.valueOf(jsonObject3.get("FItemID")));
             Map<Object, Object> map12 = JSONUtil.toMap(StringUtil.valueOf(jsonObject3.get("FDCStockID1")));