生产领料单数判断

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

@@ -490,10 +490,11 @@ public class MESServiceImpl implements MESService {
             if ("".equals(itemNo)){
                 return ApiResponse.failRsp("10041",request.getHeader("RequestId"),"物料不能为空！");
             }
-            String qty = StringUtil.nvl(object.get("FAuxQty"), "");
-            if ("".equals(qty)){
+            String fAuxQty = StringUtil.nvl(object.get("FAuxQty"), "0");
+            if ("0".equals(fAuxQty)){
                 return ApiResponse.failRsp("10042",request.getHeader("RequestId"),"实发数量不能为空！");
             }
+            Double qty = Double.parseDouble(fAuxQty);
             Map<Object, Object> map1 = JSONUtil.toMap(StringUtil.valueOf(object.get("FSCStockID1")));
             String whcode = StringUtil.nvl(map1.get("FNumber"), "");
             String whname = StringUtil.nvl(map1.get("FName"), "");
@@ -531,6 +532,9 @@ public class MESServiceImpl implements MESService {
                         "values (PRODIODETAIL_SEQ.nextval," + bcpiid + ",'" + bccode + "','"+bcpiclass+"'," + detno + ",'" + itemNo +
                         "'," + qty + ",'" + warehouses2[0] + "','" + warehouses2[1] + "','" + warehouses[0] + "','" + warehouses[1] + "','"+ficmoBillNo+"',"+mmdetno+")");
             }
+            Object mmqty = baseDao.getFieldDataByCondition("MakeMaterial", "mm_qty", "mm_id in (" + lineId + ")");
+            Double aDouble = Double.parseDouble(StringUtil.nvl(mmqty, "0"));
+            qty = qty.compareTo(aDouble) > 0 ? aDouble : qty;
             sqls.add("insert into prodiodetail (pd_id,pd_piid,pd_inoutno,pd_piclass,pd_pdno,pd_prodcode," +
                     "pd_outqty,pd_whcode,pd_whname,pd_ordercode,pd_orderdetno,pd_macode,pd_madetno) " +
                     "values (PRODIODETAIL_SEQ.nextval," + llpiid + ",'" + llcode + "','"+llpiclass+"'," + detno + ",'" + itemNo +
@@ -543,6 +547,7 @@ public class MESServiceImpl implements MESService {
         if (warehouses!=null){
             sqls.add("update prodinout set pi_purpose='"+warehouses[0]+"',pi_purposename='"+warehouses[1]+"' where pi_id="+bcpiid);
         }
+
         baseDao.execute(sqls);
         return ApiResponse.successRsp("0",request.getHeader("RequestId"),"生产领料单："+llcode+"，拨出单："+bccode+"，请在ERP查看！");
     }