手动扫码

src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java

@@ -159,20 +159,13 @@ public class IoCollectOrderCodeManController extends BaseController {
 
             collectOrderBiz = vailByBatchNo(udiRelevanceResponses, collectOrderBizs, udiEntity);
 
-            //先不管
             if (IntUtil.value(workPlace.getCheckInsert()) == 1) {
-
-            } else {
-
-            }
-
-            if (IntUtil.value(workPlace.getWarnType()) == 1) {
                 //信息提醒
                 if (collectOrderBiz == null) {
                     collectOrderBiz = scanGenOrder(udiRelevanceResponses, collectOrderBizs, udiEntity);
                     collectOrderBiz.setOrderIdFk(collectOrder.getBillNo());
                 } else {
-                    collectOrderBiz.setScanActCount(IntUtil.value(collectOrderBiz.getScanActCount()) + 1);
+                    collectOrderBiz.setScanCount(IntUtil.value(collectOrderBiz.getScanCount()) + 1);
                 }
 
             } else {
@@ -180,7 +173,7 @@ public class IoCollectOrderCodeManController extends BaseController {
                 if (collectOrderBiz == null)
                     return ResultVOUtils.error(500, "非此单据追溯码！");
                 else {
-                    collectOrderBiz.setScanActCount(IntUtil.value(collectOrderBiz.getScanActCount()) + 1);
+                    collectOrderBiz.setScanCount(IntUtil.value(collectOrderBiz.getScanCount()) + 1);
                 }
             }
 
@@ -199,17 +192,12 @@ public class IoCollectOrderCodeManController extends BaseController {
             collectOrderBiz = vailNoBatchNo(udiRelevanceResponses, collectOrderBizs);
             //先不管
             if (IntUtil.value(workPlace.getCheckInsert()) == 1) {
-
-            } else {
-
-            }
-            if (IntUtil.value(workPlace.getWarnType()) == 1) {
                 //信息提醒
                 if (collectOrderBiz == null) {
                     collectOrderBiz = scanGenOrder(udiRelevanceResponses, collectOrderBizs, udiEntity);
                     collectOrderBiz.setOrderIdFk(collectOrder.getBillNo());
                 } else {
-                    collectOrderBiz.setScanActCount(IntUtil.value(collectOrderBiz.getScanActCount()) + 1);
+                    collectOrderBiz.setScanCount(IntUtil.value(collectOrderBiz.getScanCount()) + 1);
                 }
 
             } else {
@@ -217,7 +205,7 @@ public class IoCollectOrderCodeManController extends BaseController {
                 if (collectOrderBiz == null)
                     return ResultVOUtils.error(500, "非此单据追溯码！");
                 else {
-                    collectOrderBiz.setScanActCount(IntUtil.value(collectOrderBiz.getScanActCount()) + 1);
+                    collectOrderBiz.setScanCount(IntUtil.value(collectOrderBiz.getScanCount()) + 1);
                 }
             }
         }