fix：获取桶记录

wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaProductionServiceImpl.java

@@ -123,7 +123,7 @@ public class PdaProductionServiceImpl implements PdaProductionService {
         if (ObjectUtil.isEmpty(search)) {
             throw new BadRequestException("载具不存在！");
         }
-        List<JSONObject> res = groupplateService.getPalletViewByVehicleCode(search, Arrays.asList("1", "2"));
+        List<JSONObject> res = groupplateService.getPalletViewByVehicleCode(search, Arrays.asList("1", "2", "4"));
         return PdaResponse.requestParamOk(res);
     }
 
@@ -233,10 +233,10 @@ public class PdaProductionServiceImpl implements PdaProductionService {
         log.info("手持取物料: {}", param);
         // search、rows、total_qty
         String search = param.getString("search");
-//        SchBasePoint point = pointService.getByPointCode(search, false);
-//        if (ObjectUtil.isNotEmpty(point)) {
-//            search = point.getVehicle_code();
-//        }
+        SchBasePoint point = pointService.getByPointCode(search, false);
+        if (ObjectUtil.isNotEmpty(point)) {
+            search = point.getVehicle_code();
+        }
         if (ObjectUtil.isEmpty(search)) {
             throw new BadRequestException("载具号不能为空！");
         }
@@ -318,7 +318,7 @@ public class PdaProductionServiceImpl implements PdaProductionService {
                 SchBaseTask task = list.get(0);
                 Structattr structattr = structattrService.getByCode(task.getPoint_code1());
                 List<JSONObject> res = groupplateService.getPalletViewByVehicleCode(startPoint.getVehicle_code()
-                        , Arrays.asList("2"));
+                        , Arrays.asList("2", "4"));
                 if (res.size() > 0) {
                     log.info("剩料回库");
                     // 剩料回库
@@ -327,12 +327,11 @@ public class PdaProductionServiceImpl implements PdaProductionService {
                     param.put("bill_type", IOSEnum.IN_BILL_TYPE.code("剩料回库"));
                     // 1 创建入库单、明细、分配明细
                     Map<String, Object> invObj = defaultPdaBuildParam.doBuildInvObj(param, startPoint, sectattr);
-                    invObj.put("nonChecked", "1");
                     String invId = rawAssistIStorService.insertDtl(invObj);
                     // 2 调用手动分配
                     param.put("sect_code", structattr.getSect_code());
                     param.put("sect_name", structattr.getSect_name());
-                    Map<String, Object> divObj = defaultPdaBuildParam.buildDivStructData(param, sectattr, invId, false);
+                    Map<String, Object> divObj = defaultPdaBuildParam.buildDivStructData(param, sectattr, invId, true);
                     rawAssistIStorService.divStruct(divObj);
                     // 3 创建任务
                     Map<String, Object> jsonMst = defaultPdaBuildParam.buildTaskData(startPoint, invId);
@@ -560,6 +559,11 @@ public class PdaProductionServiceImpl implements PdaProductionService {
         return PdaResponse.requestParamOk(res);
     }
 
+    /**
+     * 包衣、内包装叫料
+     * @param param
+     * @return
+     */
     @SneakyThrows
     @Override
     @Transactional(rollbackFor = Exception.class)

wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/EmpVehicleInTask.java

@@ -160,7 +160,7 @@ public class EmpVehicleInTask extends AbstractTask {
         if (ObjectUtil.isEmpty(taskObj)) {
             throw new BadRequestException("该任务不存在");
         }
-        if (Integer.parseInt(taskObj.getTask_status()) > Integer.parseInt(TaskStatus.CREATE.getCode())) {
+        if (Integer.parseInt(taskObj.getTask_status()) >= Integer.parseInt(TaskStatus.FINISHED.getCode())) {
             throw new BadRequestException("只能取消生成中的任务!");
         }
         this.cancelTask(taskObj);

wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/RawInTask.java

@@ -3,6 +3,7 @@ package org.nl.wms.sch_manage.service.util.tasks;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import org.nl.common.exception.BadRequestException;
@@ -22,7 +23,9 @@ import org.nl.wms.sch_manage.service.util.AcsTaskDto;
 import org.nl.wms.sch_manage.service.util.TaskType;
 import org.nl.wms.warehouse_management.enums.IOSConstant;
 import org.nl.wms.warehouse_management.enums.IOSEnum;
+import org.nl.wms.warehouse_management.service.IMdPbGroupplateService;
 import org.nl.wms.warehouse_management.service.IRawAssistIStorService;
+import org.nl.wms.warehouse_management.service.dao.GroupPlate;
 import org.nl.wms.warehouse_management.service.dao.IOStorInvDis;
 import org.nl.wms.warehouse_management.service.dao.mapper.IOStorInvDisMapper;
 import org.springframework.stereotype.Component;
@@ -42,7 +45,8 @@ public class RawInTask extends AbstractTask {
     private ISchBaseTaskService taskService;
     @Resource
     private IRawAssistIStorService rawAssistIStorService;
-
+    @Resource
+    private IMdPbGroupplateService groupplateService;
     @Resource
     private IOStorInvDisMapper ioStorInvDisMapper;
     @Resource
@@ -161,6 +165,7 @@ public class RawInTask extends AbstractTask {
                         .eq(SchBasePoint::getPoint_code, taskObj.getPoint_code1())
                         .set(SchBasePoint::getIng_task_code, "")
         );
+        taskConfirm(taskObj.getTask_code());
     }
 
     @Override
@@ -186,6 +191,12 @@ public class RawInTask extends AbstractTask {
 
     @Override
     public void taskConfirm(String task_code) {
+        SchBaseTask taskObj = taskService.getByCode(task_code);
 
+        groupplateService.update(
+                new LambdaUpdateWrapper<GroupPlate>()
+                        .eq(GroupPlate::getVehicle_code, taskObj.getVehicle_code())
+                        .set(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("入库"))
+        );
     }
 }

wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/WrappingDownTask.java

@@ -28,7 +28,7 @@ import java.util.Collections;
 import java.util.List;
 
 /**
- *
+ * 缠绕机下料
  * @author: lyd
  * @date: 2026/1/12
  */
@@ -45,7 +45,7 @@ public class WrappingDownTask extends AbstractTask {
         // 查找空闲的需要缠绕的点
         List<SchBasePoint> list = pointService.getNoTaskPointByRegionAndType("CRHCQ", "4", "1");
         if (list.size() == 0) {
-            throw new BadRequestException("没有需要缠绕的点！");
+            throw new BadRequestException("没有空闲的已缠绕点！");
         }
         SchBasePoint basePoint = list.get(0);
         SchBasePoint parentPoint = pointService.getById(json.getString("device_code"));