1.拆包问题提交

src/main/java/com/neotel/smfcore/core/storage/service/manager/impl/StoragePosManagerImpl.java

@@ -347,7 +347,7 @@ public class StoragePosManagerImpl implements IStoragePosManager {
         }else if(CHECKOUT_TYPE.FIFO.equals(checkoutType)){//严格的先进先出
         }else if(CHECKOUT_TYPE.FIFO.equals(checkoutType)){//严格的先进先出
             sort = Sort.by(Sort.Direction.ASC, "barcode.putInDate", "barcode.usedCount");
             sort = Sort.by(Sort.Direction.ASC, "barcode.putInDate", "barcode.usedCount");
         }else if(CHECKOUT_TYPE.USED_FIRST.equals(checkoutType)){//尾料优先
         }else if(CHECKOUT_TYPE.USED_FIRST.equals(checkoutType)){//尾料优先
-            sort = Sort.by(Sort.Direction.ASC, "barcode.amount", "barcode.putInDate");
+            sort = Sort.by(Sort.Direction.ASC, "barcode.amount", "barcode.produceDate","barcode.putInDate");
         }else if(CHECKOUT_TYPE.PRODUCE_DATE.equals(checkoutType)){
         }else if(CHECKOUT_TYPE.PRODUCE_DATE.equals(checkoutType)){
             //先生产先出
             //先生产先出
             sort = Sort.by(Sort.Direction.ASC, "barcode.produceDate","barcode.amount", "barcode.putInDate");
             sort = Sort.by(Sort.Direction.ASC, "barcode.produceDate","barcode.amount", "barcode.putInDate");

src/main/java/com/neotel/smfcore/custom/aiqingzhiyin1643/controller/MaterialOperationController.java

@@ -14,6 +14,7 @@ import com.neotel.smfcore.core.storage.service.po.Storage;
 import com.neotel.smfcore.core.storage.service.po.StoragePos;
 import com.neotel.smfcore.core.storage.service.po.StoragePos;
 import com.neotel.smfcore.core.system.service.po.DataLog;
 import com.neotel.smfcore.core.system.service.po.DataLog;
 import com.neotel.smfcore.core.system.util.TaskService;
 import com.neotel.smfcore.core.system.util.TaskService;
+import com.neotel.smfcore.custom.aiqingzhiyin1643.util.BoxUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
@@ -118,8 +119,7 @@ public class MaterialOperationController {
         dataLog.setType(OP.PUT_IN);
         dataLog.setType(OP.PUT_IN);
         dataLog.setStatus(OP_STATUS.FINISHED.name());
         dataLog.setStatus(OP_STATUS.FINISHED.name());
         dataLog.setOperator(SecurityUtils.getLoginUsername());
         dataLog.setOperator(SecurityUtils.getLoginUsername());
-        taskService.updateFinishedTask(dataLog);
-
+        BoxUtil.intoPos(dataLog);
         log.info("[人工上架] code: {} 任务生成成功，任务ID: {}", code, dataLog.getId());
         log.info("[人工上架] code: {} 任务生成成功，任务ID: {}", code, dataLog.getId());
         return ResultBean.newOkResult("");
         return ResultBean.newOkResult("");
     }
     }
@@ -168,6 +168,9 @@ public class MaterialOperationController {
         dataLog.setOperator(SecurityUtils.getLoginUsername());
         dataLog.setOperator(SecurityUtils.getLoginUsername());
         taskService.updateFinishedTask(dataLog);
         taskService.updateFinishedTask(dataLog);
 
 
+        BoxUtil.outFromPos(dataLog);
+
+
         log.info("[人工下架] code: {} 任务生成成功，任务ID: {}", code, dataLog.getId());
         log.info("[人工下架] code: {} 任务生成成功，任务ID: {}", code, dataLog.getId());
         return ResultBean.newOkResult("");
         return ResultBean.newOkResult("");
     }
     }

src/main/java/com/neotel/smfcore/custom/aiqingzhiyin1643/controller/MaterialUnpackingController.java

@@ -62,7 +62,7 @@ public class MaterialUnpackingController {
     @ApiOperation("1.扫描物料条码判断是否在任务单中")
     @ApiOperation("1.扫描物料条码判断是否在任务单中")
     @RequestMapping("/barcodeInReceiptOrder")
     @RequestMapping("/barcodeInReceiptOrder")
     @AnonymousAccess
     @AnonymousAccess
-    public ResultBean barcodeInReceiptOrder(@RequestBody Map<String, String> paramMap) {
+    public synchronized ResultBean barcodeInReceiptOrder(@RequestBody Map<String, String> paramMap) {
         String receiptOrder = paramMap.get("receiptOrder");
         String receiptOrder = paramMap.get("receiptOrder");
         String code = paramMap.get("code");
         String code = paramMap.get("code");
         log.info("校验条码是否在任务单，条码：" + code + "，入库单：" + receiptOrder);
         log.info("校验条码是否在任务单，条码：" + code + "，入库单：" + receiptOrder);

src/main/resources/config/application-prod.yml

@@ -2,7 +2,7 @@
 
 
 # 登录相关配置
 # 登录相关配置
 login:
 login:
-  single-login: true
+  single-login: false
 
 
 #配置数据源
 #配置数据源
 spring:
 spring:
@@ -17,13 +17,13 @@ spring:
 
 
     #备份数据库,如果有,则开启,注意:如果主数据库设置了用户名和密码,备份服务器必须设置用户名和密码!!
     #备份数据库,如果有,则开启,注意:如果主数据库设置了用户名和密码,备份服务器必须设置用户名和密码!!
     #西门子的正式和备份数据库,用户名和密码都是Siemens
     #西门子的正式和备份数据库,用户名和密码都是Siemens
-    #backup-mongodb:
-    #  auto-index-creation: true # 默认为false，即不会自动创建索引
-    #  host: localhost  # 主机地址
-    #  port: 27017           # 端口
-    #  database: backup_smf        # 数据库
-    #  username:
-    #  password:
+    backup-mongodb:
+      auto-index-creation: true # 默认为false，即不会自动创建索引
+      host: 10.42.53.95  # 主机地址
+      port: 27017           # 端口
+      database: smf        # 数据库
+      username:
+      password:
 
 
   servlet:
   servlet:
     multipart:
     multipart: