原材料同一个料格增加库别验证

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/controller/CDeviceController.java

@@ -258,7 +258,7 @@ public class CDeviceController {
                     if (dataLog.isPutInTask()) {
                     if (dataLog.isPutInTask()) {
                         return ResultBean.newOkResult(dataLog);
                         return ResultBean.newOkResult(dataLog);
                     } else {
                     } else {
-                        return ResultBean.newErrorResult(-1, "", boxStr + "已经有出库任务,请继续入库");
+                        return ResultBean.newErrorResult(-1, "", boxStr + "已经有出库任务,请先完成出库任务");
                     }
                     }
                 }
                 }
             }
             }
@@ -547,6 +547,8 @@ public class CDeviceController {
         //将GR日期设置为生产日期
         //将GR日期设置为生产日期
         Date grDate = DateUtil.getNoTimeDate(bindGrInfo.getGrDate());
         Date grDate = DateUtil.getNoTimeDate(bindGrInfo.getGrDate());
         stackerBarcode.setProduceDate(grDate);
         stackerBarcode.setProduceDate(grDate);
+        String warhouseCode = MaterialUtil.getWarhouseCode(stackerId);
+        stackerBarcode.setWarehouseCode(warhouseCode);
 
 
         String[] binList = binListStr.split(",");
         String[] binList = binListStr.split(",");
         for (String binId : binList) {
         for (String binId : binList) {
@@ -555,6 +557,8 @@ public class CDeviceController {
             String canPutIn = canMaterialPutInBin(stackerBarcode,boxBarcode,binId);
             String canPutIn = canMaterialPutInBin(stackerBarcode,boxBarcode,binId);
             if(canPutIn.isEmpty()){
             if(canPutIn.isEmpty()){
                 validBinList.add(binId);
                 validBinList.add(binId);
+            }else{
+                log.info(canPutIn);
             }
             }
         }
         }
 
 
@@ -574,7 +578,7 @@ public class CDeviceController {
             //该料格已放满, 不可以再放料
             //该料格已放满, 不可以再放料
             return "料格["+binId+"]已满,不可放入物料["+reelBarcode.getBarcode()+"]";
             return "料格["+binId+"]已满,不可放入物料["+reelBarcode.getBarcode()+"]";
         }
         }
-        if (BinCacheUtil.canPutInBinCode(binId, reelBarcode.getWarehouseCode())) {
+        if (!BinCacheUtil.canPutInBinCode(binId, reelBarcode.getWarehouseCode())) {
             return "库别["+reelBarcode.getWarehouseCode()+"]不可放入料格["+binId+"]";
             return "库别["+reelBarcode.getWarehouseCode()+"]不可放入料格["+binId+"]";
         }
         }
         List<Barcode> subCodeList = boxBarcode.getSubCodeList();
         List<Barcode> subCodeList = boxBarcode.getSubCodeList();

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/wipstor/controller/WipStorCheckOutController.java

@@ -133,6 +133,7 @@ public class WipStorCheckOutController {
         List<FetchShipmentInfoResult> resultList = LuxsanApi.fetchShipmentInfo(new FetchShipmentInfoRequest(CommonUtil.plantCode, odn));
         List<FetchShipmentInfoResult> resultList = LuxsanApi.fetchShipmentInfo(new FetchShipmentInfoRequest(CommonUtil.plantCode, odn));
         for (FetchShipmentInfoResult result : resultList) {
         for (FetchShipmentInfoResult result : resultList) {
             LiteOrderItem orderItem = new LiteOrderItem();
             LiteOrderItem orderItem = new LiteOrderItem();
+            orderItem.setPn(result.getMATERIAL_CODE());
             orderItem.setRtvId(result.getRTV_ID());
             orderItem.setRtvId(result.getRTV_ID());
             orderItem.setPlantCode(result.getPLANT_CODE());
             orderItem.setPlantCode(result.getPLANT_CODE());
             orderItem.setTicketCode(result.getTICKET_CODE());
             orderItem.setTicketCode(result.getTICKET_CODE());