Merge remote-tracking branch 'origin/smf-core-21088' into smf-core-21088

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

@@ -120,6 +120,16 @@ public class ManualGrPutInController {
         if (StringUtils.isEmpty(boxStr)) {
         if (StringUtils.isEmpty(boxStr)) {
             return ResultBean.newErrorResult(-1, "smfcore.valueCanotNull", "{0}不能为空", new String[]{"料箱信息"});
             return ResultBean.newErrorResult(-1, "smfcore.valueCanotNull", "{0}不能为空", new String[]{"料箱信息"});
         }
         }
+
+        Barcode barcode = codeResolve.resolveCode(boxStr);
+        if (barcode != null){
+            StoragePos pos = storagePosManager.getByBarcode(barcode.getBarcode());
+            if (pos != null){
+                barcode = pos.getBarcode();
+                barcodeManager.save(barcode);
+            }
+        }
+
         return ResultBean.newOkResult(BoxHandleUtil.getBoxInfo(boxStr));
         return ResultBean.newOkResult(BoxHandleUtil.getBoxInfo(boxStr));
     }
     }
 
 
@@ -224,7 +234,10 @@ public class ManualGrPutInController {
 
 
         //判断隔口能否放入
         //判断隔口能否放入
         if (boxBarcode != null){
         if (boxBarcode != null){
-            if (BinCacheUtil.canPutInBinCode(binCode, warhouseCode)) {
+
+            String canPutIn = BinCacheUtil.canMaterialPutInBin(barcode, boxBarcode, binCode);
+
+            if (StringUtils.isEmpty(canPutIn)) {
                 NewLabelToCellResult cell = LuxsanApi.newLabelToCell(new NewLabelToCellRequest(CommonUtil.plantCode, Arrays.asList(udCode), barcode.getAmount(), binCode, Arrays.asList(barcode.getFullCode())));
                 NewLabelToCellResult cell = LuxsanApi.newLabelToCell(new NewLabelToCellRequest(CommonUtil.plantCode, Arrays.asList(udCode), barcode.getAmount(), binCode, Arrays.asList(barcode.getFullCode())));
                 //将GR日期设置为生产日期
                 //将GR日期设置为生产日期
                 Date grDate = DateUtil.getNoTimeDate(cell.getGR_DATE());
                 Date grDate = DateUtil.getNoTimeDate(cell.getGR_DATE());
@@ -248,6 +261,9 @@ public class ManualGrPutInController {
                 int amount = barcode.getAmount();
                 int amount = barcode.getAmount();
                 GrUtil.addQty(grCode, grItem, amount);
                 GrUtil.addQty(grCode, grItem, amount);
                 return ResultBean.newOkResult(BoxHandleUtil.getBoxInfo(boxStr));
                 return ResultBean.newOkResult(BoxHandleUtil.getBoxInfo(boxStr));
+            } else {
+                log.info(barcode.getBarcode() + "不可以放到料格:" + binCode+",原因为:"+canPutIn);
+                return ResultBean.newErrorResult(-1, "", barcode.getBarcode() + "不可以放到料格:" + binCode+",原因为:"+canPutIn);
             }
             }
         }
         }
         return ResultBean.newErrorResult(-1, "", barcode.getBarcode() + "不可以放到料格:" + binCode);
         return ResultBean.newErrorResult(-1, "", barcode.getBarcode() + "不可以放到料格:" + binCode);