1.A/B面显示问题处理

2.GR入库卡控料箱条码

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

@@ -81,7 +81,7 @@ public class ManualGrPutInController {
 
 
     @ApiOperation("获取GR已过账的列表")
     @ApiOperation("获取GR已过账的列表")
     @RequestMapping("/grStatus")
     @RequestMapping("/grStatus")
-    @AnonymousAccess
+    //@AnonymousAccess
     public ResultBean grStatus(@RequestBody Map<String, String> paramMap) {
     public ResultBean grStatus(@RequestBody Map<String, String> paramMap) {
         //物料
         //物料
         String codeStr = paramMap.get("codeStr");
         String codeStr = paramMap.get("codeStr");
@@ -103,7 +103,7 @@ public class ManualGrPutInController {
 
 
     @ApiOperation("缓存已过帐缓存信息")
     @ApiOperation("缓存已过帐缓存信息")
     @RequestMapping("/bindGrUdQty")
     @RequestMapping("/bindGrUdQty")
-    @AnonymousAccess
+    //@AnonymousAccess
     public ResultBean bindGrUdQty(@RequestBody GrUdNum grUdNum) {
     public ResultBean bindGrUdQty(@RequestBody GrUdNum grUdNum) {
         GrUtil.updateGrUdQty(grUdNum.getCode(), grUdNum.getGrCode(), grUdNum.getGrItem(), grUdNum.getPickedQty(), grUdNum.getLotQty());
         GrUtil.updateGrUdQty(grUdNum.getCode(), grUdNum.getGrCode(), grUdNum.getGrItem(), grUdNum.getPickedQty(), grUdNum.getLotQty());
         return ResultBean.newOkResult(GrUtil.getGrUdQty(grUdNum.getGrCode(), grUdNum.getGrItem()));
         return ResultBean.newOkResult(GrUtil.getGrUdQty(grUdNum.getGrCode(), grUdNum.getGrItem()));
@@ -111,7 +111,7 @@ public class ManualGrPutInController {
 
 
     @ApiOperation("获取过账信息")
     @ApiOperation("获取过账信息")
     @RequestMapping("/grUdNum")
     @RequestMapping("/grUdNum")
-    @AnonymousAccess
+    //@AnonymousAccess
     public ResultBean getGrUdNum(String grCode, String grItem) {
     public ResultBean getGrUdNum(String grCode, String grItem) {
         if (StringUtils.isEmpty(grCode)) {
         if (StringUtils.isEmpty(grCode)) {
             return ResultBean.newErrorResult(-1, "smfcore.valueCanotNull", "{0}不能为空", new String[]{"grCode"});
             return ResultBean.newErrorResult(-1, "smfcore.valueCanotNull", "{0}不能为空", new String[]{"grCode"});
@@ -124,12 +124,23 @@ public class ManualGrPutInController {
 
 
     @ApiOperation("获取料箱信息")
     @ApiOperation("获取料箱信息")
     @RequestMapping("/getBoxInfo")
     @RequestMapping("/getBoxInfo")
-    @AnonymousAccess
+    //@AnonymousAccess
     public ResultBean getBoxInfo(String boxStr){
     public ResultBean getBoxInfo(String boxStr){
         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[]{"料箱信息"});
         }
         }
 
 
+        //如果不是C07,C13,C15开头的 报错
+        if (!boxStr.startsWith("C07") && !boxStr.startsWith("C13") && !boxStr.startsWith("C15")) {
+            return ResultBean.newErrorResult(-1, "", boxStr + "不是有效的料箱条码");
+        }
+
+        //如果不是以A/B结尾的,则提示
+        if (!boxStr.endsWith("A") && !boxStr.endsWith("B")){
+            return ResultBean.newErrorResult(-1, "", boxStr + "请输入完整的料箱条码");
+        }
+
+
         Barcode barcode = codeResolve.resolveCode(boxStr);
         Barcode barcode = codeResolve.resolveCode(boxStr);
         if (barcode != null){
         if (barcode != null){
             StoragePos pos = storagePosManager.getByBarcode(barcode.getBarcode());
             StoragePos pos = storagePosManager.getByBarcode(barcode.getBarcode());
@@ -148,7 +159,7 @@ public class ManualGrPutInController {
 
 
     @ApiOperation("GR料盘入到料格")
     @ApiOperation("GR料盘入到料格")
     @RequestMapping("/reelToBox")
     @RequestMapping("/reelToBox")
-    @AnonymousAccess
+    //@AnonymousAccess
     public synchronized ResultBean reelToBox(@RequestBody Map<String, String> paramMap) {
     public synchronized ResultBean reelToBox(@RequestBody Map<String, String> paramMap) {
 
 
 
 
@@ -288,7 +299,7 @@ public class ManualGrPutInController {
 
 
     @ApiOperation("完成装箱并入库")
     @ApiOperation("完成装箱并入库")
     @RequestMapping("/boxToPos")
     @RequestMapping("/boxToPos")
-    @AnonymousAccess
+    //@AnonymousAccess
     public synchronized ResultBean boxToPosNew(String boxStr, String posName,String type) {
     public synchronized ResultBean boxToPosNew(String boxStr, String posName,String type) {
 
 
         if (StringUtils.isEmpty(boxStr)) {
         if (StringUtils.isEmpty(boxStr)) {

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/util/BoxHandleUtil.java

@@ -399,11 +399,11 @@ public class BoxHandleUtil {
                 if (barcode != null) {
                 if (barcode != null) {
                     boxStr = barcode.getBarcode();
                     boxStr = barcode.getBarcode();
                     String endStr = code.substring(code.length() - 1);  //得到是A、B面
                     String endStr = code.substring(code.length() - 1);  //得到是A、B面
-                    if (boxSideMap.get(boxStr) != null) {
+                    /*if (boxSideMap.get(boxStr) != null) {
                         endStr = boxSideMap.get(boxStr);
                         endStr = boxSideMap.get(boxStr);
                     } else {
                     } else {
                         boxSideMap.put(boxStr, endStr);
                         boxSideMap.put(boxStr, endStr);
-                    }
+                    }*/
                     List<Barcode> subCodeList = barcode.getSubCodeList();
                     List<Barcode> subCodeList = barcode.getSubCodeList();
                     if (subCodeList == null){
                     if (subCodeList == null){
                         subCodeList = new ArrayList<>();
                         subCodeList = new ArrayList<>();