1.已经入过库的物料,再入料架增加2次弹窗功能

src/main/java/com/neotel/smfcore/core/barcode/service/po/Barcode.java

@@ -548,4 +548,12 @@ public class Barcode extends BasePo implements Serializable {
             }
             }
         }
         }
     }
     }
+
+    public boolean isPutIn(){
+        if (putInTime != -1){
+            return true;
+        }
+        return false;
+    }
+
 }
 }

src/main/java/com/neotel/smfcore/core/device/handler/impl/NLPShelfHandler.java

@@ -61,6 +61,7 @@ public class NLPShelfHandler extends BaseDeviceHandler {
         String storageId = mapValues.get("storageId");
         String storageId = mapValues.get("storageId");
         String sourceId = mapValues.get("sourceId");
         String sourceId = mapValues.get("sourceId");
         String token = tokenProvider.getToken(request);
         String token = tokenProvider.getToken(request);
+        String amountStr = mapValues.get("amount");
         if (ObjectUtils.isEmpty(code)) {
         if (ObjectUtils.isEmpty(code)) {
             throw new ValidateException("smfcore.valueCanotNull", "{0}不能为空", new String[]{"code"});
             throw new ValidateException("smfcore.valueCanotNull", "{0}不能为空", new String[]{"code"});
         }
         }
@@ -112,14 +113,14 @@ public class NLPShelfHandler extends BaseDeviceHandler {
             if (verResult != null) {
             if (verResult != null) {
                 barcodeSave = verResult;
                 barcodeSave = verResult;
             }
             }
-            return putIn(loginUser, groupId, storageId, barcodeSave, token);
+            return putIn(loginUser, groupId, storageId, barcodeSave, token,amountStr);
         }catch (ValidateException ve){
         }catch (ValidateException ve){
             return ResultBean.newErrorResult(-1,ve.getMsgKey(),ve.getDefaultMsg(),ve.getMsgParam());
             return ResultBean.newErrorResult(-1,ve.getMsgKey(),ve.getDefaultMsg(),ve.getMsgParam());
         }
         }
 
 
     }
     }
 
 
-    protected ResultBean putIn(String loginUser, String groupId, String storageId, Barcode barcode, String token) {
+    protected ResultBean putIn(String loginUser, String groupId, String storageId, Barcode barcode, String token,String amountStr) {
 
 
 //        CodeBean codeBean = codeResolve.resolveSingleCode(codeStr);
 //        CodeBean codeBean = codeResolve.resolveSingleCode(codeStr);
         if (barcode == null || barcode.getBarcode() == null) {
         if (barcode == null || barcode.getBarcode() == null) {
@@ -143,6 +144,27 @@ public class NLPShelfHandler extends BaseDeviceHandler {
             }
             }
         }
         }
 
 
+        if (dataCache.shelfConfirmPutIn()) {
+            if (barcode.isPutIn()) {
+                if (amountStr == null) {
+                    ResultBean resultBean = ResultBean.newOkResult(barcode);
+                    resultBean.setCode(99);
+                    return resultBean;
+                } else {
+                    int amount = 0;
+                    try {
+                        amount = Integer.parseInt(amountStr);
+                    } catch (NumberFormatException e) {
+                        e.printStackTrace();
+                    }
+                    if (amount <= 0) {
+                        throw new ValidateException("smfcore.materialBox.qtyError", "请输入正确的数量");
+                    }
+                    barcode.setAmount(amount);
+                }
+            }
+        }
+
         String pn = barcode.getPartNumber();
         String pn = barcode.getPartNumber();
         String reelId = barcode.getBarcode();
         String reelId = barcode.getBarcode();
         String num = barcode.getAmount() + "";
         String num = barcode.getAmount() + "";

src/main/java/com/neotel/smfcore/core/device/handler/impl/NLShelfHandler.java

@@ -266,6 +266,7 @@ public class NLShelfHandler extends BaseDeviceHandler {
         String token = tokenProvider.getToken(request);
         String token = tokenProvider.getToken(request);
         String ptoken=token.substring(token.length()-10);
         String ptoken=token.substring(token.length()-10);
         String loginUser = SecurityUtils.getLoginUsername();
         String loginUser = SecurityUtils.getLoginUsername();
+        String amountStr = mapValues.get("amount");
         log.info(storageId + "扫到条码["+code+"]" );
         log.info(storageId + "扫到条码["+code+"]" );
         if (ObjectUtils.isEmpty(code)) {
         if (ObjectUtils.isEmpty(code)) {
             throw new ValidateException("smfcore.valueCanotNull", "{0}不能为空", new String[]{"code"});
             throw new ValidateException("smfcore.valueCanotNull", "{0}不能为空", new String[]{"code"});
@@ -345,7 +346,7 @@ public class NLShelfHandler extends BaseDeviceHandler {
             } catch (Exception exa) {
             } catch (Exception exa) {
                 log.error(exa.toString());
                 log.error(exa.toString());
             }
             }
-            resultBean = putInProcess(groupId, storageId, code, token, loginUser);
+            resultBean = putInProcess(groupId, storageId, code, token, loginUser,amountStr);
             if (resultBean != null) {
             if (resultBean != null) {
                 return resultBean;
                 return resultBean;
             }
             }
@@ -400,7 +401,7 @@ public class NLShelfHandler extends BaseDeviceHandler {
 
 
 
 
 
 
-    private synchronized ResultBean putInProcess(String groupId, String storageId, String code, String token,String loginUser){
+    private synchronized ResultBean putInProcess(String groupId, String storageId, String code, String token,String loginUser,String amountStr){
         //扫的是物料条码
         //扫的是物料条码
         CodeValidateParam params = new CodeValidateParam(loginUser,groupId,storageId,code,token);
         CodeValidateParam params = new CodeValidateParam(loginUser,groupId,storageId,code,token);
         Barcode barcode  = smfApi.canPutInBeforeResolve(params);
         Barcode barcode  = smfApi.canPutInBeforeResolve(params);
@@ -419,6 +420,27 @@ public class NLShelfHandler extends BaseDeviceHandler {
             }
             }
         }
         }
 
 
+        if (dataCache.shelfConfirmPutIn()) {
+            if (barcode.isPutIn()) {
+                if (amountStr == null) {
+                    ResultBean resultBean = ResultBean.newOkResult(barcode);
+                    resultBean.setCode(99);
+                    return resultBean;
+                } else {
+                    int amount = 0;
+                    try {
+                        amount = Integer.parseInt(amountStr);
+                    } catch (NumberFormatException e) {
+                        e.printStackTrace();
+                    }
+                    if (amount <= 0) {
+                        throw new ValidateException("smfcore.materialBox.qtyError", "请输入正确的数量");
+                    }
+                    barcode.setAmount(amount);
+                }
+            }
+        }
+
         try {
         try {
             long now = System.currentTimeMillis();
             long now = System.currentTimeMillis();
             //5秒内同一个条码忽略
             //5秒内同一个条码忽略

src/main/java/com/neotel/smfcore/core/device/util/DataCache.java

@@ -172,6 +172,10 @@ public class DataCache {
         return orderSetting;
         return orderSetting;
     }
     }
 
 
+    public boolean shelfConfirmPutIn() {
+        return getOrderSetting().isShelfConfigPutIn();
+    }
+
     public List<LanguageInfo> getLanguageList() {
     public List<LanguageInfo> getLanguageList() {
         List<LanguageInfo> lanList = getCache(Constants.CACHE_languageType);
         List<LanguageInfo> lanList = getCache(Constants.CACHE_languageType);
         if (lanList == null || lanList.size() <= 0) {
         if (lanList == null || lanList.size() <= 0) {

src/main/java/com/neotel/smfcore/core/system/bean/OrderSetting.java

@@ -47,4 +47,6 @@ public class OrderSetting implements Serializable {
      */
      */
     @ApiModelProperty("料架亮灯方式，0=全部亮灯，1=亮灯指引，默认0")
     @ApiModelProperty("料架亮灯方式，0=全部亮灯，1=亮灯指引，默认0")
     public Integer shelfLightType=0;
     public Integer shelfLightType=0;
+
+    public boolean shelfConfigPutIn = false;
 }
 }