pk出库 出到w21f到人工手动线

src/main/java/com/neotel/smfcore/core/order/LiteOrderCache.java

@@ -43,6 +43,7 @@ import com.neotel.smfcore.custom.luxsan.factory_c.common.util.CommonUtil;
 import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.enums.LiteorderCheckType;
 import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.enums.LiteorderCheckType;
 import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.enums.TaskCurrentLoc;
 import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.enums.TaskCurrentLoc;
 import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.util.BinCacheUtil;
 import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.util.BinCacheUtil;
+import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.util.CheckOutUtil;
 import com.neotel.smfcore.custom.luxsan.factory_c.wipstor.util.TaskLocUtil;
 import com.neotel.smfcore.custom.luxsan.factory_c.wipstor.util.TaskLocUtil;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -1138,7 +1139,7 @@ public class LiteOrderCache {
                     task.setStatus(OP_STATUS.WAIT.name());
                     task.setStatus(OP_STATUS.WAIT.name());
 
 
                     //判断是去人工出料口,还是机器
                     //判断是去人工出料口,还是机器
-                    if (LiteorderCheckType.TICKET_CHECKOUT == liteOrder.getCheckType()){
+                    if (LiteorderCheckType.TICKET_CHECKOUT == liteOrder.getCheckType() || CheckOutUtil.loc_1F.equals(liteOrder.getLoc())){
                         task.setLoc(TaskCurrentLoc.Manual_FeedingInlet);
                         task.setLoc(TaskCurrentLoc.Manual_FeedingInlet);
                     }
                     }
 
 

src/main/java/com/neotel/smfcore/custom/luxsan/api/bean/result/QueryPickingResult.java

@@ -60,4 +60,7 @@ public class QueryPickingResult {
 
 
     //工单完成时间
     //工单完成时间
     private Date finishDate;
     private Date finishDate;
+
+    //出库目的地
+    private String targetLoc;
 }
 }

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/bean/dto/QueryPickingDto.java

@@ -60,6 +60,9 @@ public class QueryPickingDto {
     //工单完成时间
     //工单完成时间
     private Date finishDate;
     private Date finishDate;
 
 
+
+    private String targetLoc;
+
     public static QueryPickingDto convertQueryPickingResultDto(QueryPickingResult result){
     public static QueryPickingDto convertQueryPickingResultDto(QueryPickingResult result){
         QueryPickingDto queryPickingResultDto = new QueryPickingDto();
         QueryPickingDto queryPickingResultDto = new QueryPickingDto();
         queryPickingResultDto.setPlantCode(result.getPLANT_CODE());
         queryPickingResultDto.setPlantCode(result.getPLANT_CODE());
@@ -79,6 +82,7 @@ public class QueryPickingDto {
         queryPickingResultDto.setEndDate(result.getEndDate());
         queryPickingResultDto.setEndDate(result.getEndDate());
         queryPickingResultDto.setFinishDate(result.getFinishDate());
         queryPickingResultDto.setFinishDate(result.getFinishDate());
         queryPickingResultDto.setCheckOut(result.isCheckOut());
         queryPickingResultDto.setCheckOut(result.isCheckOut());
+        queryPickingResultDto.setTargetLoc(result.getTargetLoc());
         return queryPickingResultDto;
         return queryPickingResultDto;
     }
     }
 
 

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

@@ -88,6 +88,7 @@ public class PkCheckOutController {
                 if (!liteOrder.isTaskFinished() || liteOrder.isClosed()){
                 if (!liteOrder.isTaskFinished() || liteOrder.isClosed()){
                     queryPickingResult.setCheckOut(false);
                     queryPickingResult.setCheckOut(false);
                 }
                 }
+                queryPickingResult.setTargetLoc(liteOrder.getLoc());
             }
             }
         }
         }
         pickingResultList = pickingResultList.stream().sorted(Comparator.comparing(QueryPickingResult :: getCREATE_AT)).collect(Collectors.toList());
         pickingResultList = pickingResultList.stream().sorted(Comparator.comparing(QueryPickingResult :: getCREATE_AT)).collect(Collectors.toList());