1.同一个隔口,不用的物料编号 修改

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

@@ -260,7 +260,8 @@ public class CDeviceController {
 
 
             if (boxBarcode != null) {
             if (boxBarcode != null) {
                 //判断隔口是否可以放入
                 //判断隔口是否可以放入
-                if (BinCacheUtil.canPutInBinCode(binCodeStr, warhouseCode)) {
+                String canPutIn = BinCacheUtil.canMaterialPutInBin(barcode, boxBarcode, binCodeStr);
+                if (StringUtils.isEmpty(canPutIn)) {
 
 
                     //绑定gr
                     //绑定gr
                     if (MaterialUtil.bindGr(materialStr)) {
                     if (MaterialUtil.bindGr(materialStr)) {
@@ -359,6 +360,9 @@ public class CDeviceController {
 
 
                     log.info("料格:"+binCodeStr+"barcode:"+barcode.getBarcode()+"返回成功");
                     log.info("料格:"+binCodeStr+"barcode:"+barcode.getBarcode()+"返回成功");
                     return ResultBean.newOkResult("");
                     return ResultBean.newOkResult("");
+                } else {
+                    log.info(barcode.getBarcode() + "不可以放到料格:" + binCodeStr+",原因为:"+canPutIn);
+                    return ResultBean.newErrorResult(-1, "", barcode.getBarcode() + "不可以放到料格:" + binCodeStr+",原因为:"+canPutIn);
                 }
                 }
             }
             }
             return ResultBean.newErrorResult(-1, "", barcode.getBarcode() + "不可以放到料格:" + binCodeStr);
             return ResultBean.newErrorResult(-1, "", barcode.getBarcode() + "不可以放到料格:" + binCodeStr);