1.手动工单不出库问题修改

src/main/java/com/neotel/smfcore/core/device/rest/DeviceController.java

@@ -113,7 +113,7 @@ public class DeviceController {
             printSeq = false;
             printSeq = false;
         }
         }
         if (printSeq){
         if (printSeq){
-            log.info("收到料仓"+statusBean.getCid()+"定时请求,序列号为:"+statusBean.getSeq());
+            //log.info("收到料仓"+statusBean.getCid()+"定时请求,序列号为:"+statusBean.getSeq());
         }
         }
         try {
         try {
             String cid = statusBean.getCid();
             String cid = statusBean.getCid();

src/main/java/com/neotel/smfcore/core/storage/rest/StoragePosController.java

@@ -738,7 +738,7 @@ public class StoragePosController {
         }
         }
 
 
         String model = checkOutDto.getModel();
         String model = checkOutDto.getModel();
-        if (StringUtils.isEmpty(model)) {
+        //if (StringUtils.isEmpty(model)) {
             if (StringUtils.isNotEmpty(line)) {
             if (StringUtils.isNotEmpty(line)) {
                 if (line.startsWith("C02-1FSMT-98")){
                 if (line.startsWith("C02-1FSMT-98")){
                     model = "RAINIER";
                     model = "RAINIER";
@@ -784,7 +784,7 @@ public class StoragePosController {
             } else {
             } else {
                 model = "ALL";
                 model = "ALL";
             }
             }
-        }
+        //}
 
 
         if ("C2".equals(line)){
         if ("C2".equals(line)){
             checkOutDto.setForceOut(true);
             checkOutDto.setForceOut(true);

src/main/java/com/neotel/smfcore/core/system/util/TaskService.java

@@ -1422,7 +1422,7 @@ public class TaskService {
     private DataLog findSmallReelTask(String cid, String sourceId){
     private DataLog findSmallReelTask(String cid, String sourceId){
         List<DataLog> allTasks = getAllTasks();
         List<DataLog> allTasks = getAllTasks();
         boolean otherStorageHasBigReel = otherStorageHasBigReel(allTasks, sourceId);
         boolean otherStorageHasBigReel = otherStorageHasBigReel(allTasks, sourceId);
-        String limitSide = "";
+        String limitSide = "B";
         if(otherStorageHasBigReel){
         if(otherStorageHasBigReel){
             //其他仓有大料盘未出,限制T面出库(即出B面的小盘)
             //其他仓有大料盘未出,限制T面出库(即出B面的小盘)
             limitSide = "T";
             limitSide = "T";

src/main/resources/config/application.yml

@@ -103,5 +103,5 @@ app:
   type: ""
   type: ""
 
 
 menu:
 menu:
-  show: partMasterData,wireQtyMaint
+  show:
   hide:
   hide:
\ No newline at end of file