rev: 异常任务修改

lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/SchBasePoint.java

@@ -28,6 +28,7 @@ public class SchBasePoint extends Model<SchBasePoint> {
     /**
      * 点位标识
      */
+    @TableId
     private Long point_id;
 
 

lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoLashTask.java

@@ -39,8 +39,7 @@ import java.util.stream.Collectors;
  * 二期捆扎任务类
  * Created by Lxy on 2024/1/19.
  */
-@Service
+@Service()
-@RequiredArgsConstructor
 public class TwoLashTask extends AbstractAcsTask {
 
     /**
@@ -48,7 +47,8 @@ public class TwoLashTask extends AbstractAcsTask {
      */
     private final String THIS_CLASS = TwoLashTask.class.getName();
 
-    private final IBstIvtBoxinfoService iBstIvtBoxinfoService;
+    @Autowired
+    private IBstIvtBoxinfoService iBstIvtBoxinfoService;
 
     @Override
     public List<AcsTaskDto> addTask() {

lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java

@@ -5,6 +5,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import lombok.RequiredArgsConstructor;
 import org.nl.b_lms.sch.task.dao.SchBaseTask;
 import org.nl.b_lms.sch.task.service.IschBaseTaskService;
 import org.nl.b_lms.sch.tasks.TwoInBoxTask;
@@ -21,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
@@ -35,6 +37,7 @@ import java.util.stream.Collectors;
  * @since 2023-11-10
  */
 @Service
+@RequiredArgsConstructor
 public class InBoxManageServiceImpl implements InBoxManageService {
 
     /**
@@ -50,14 +53,12 @@ public class InBoxManageServiceImpl implements InBoxManageService {
     /**
      * 木箱信息服务
      */
-    @Autowired
+    private final IBstIvtBoxinfoService iBstIvtBoxinfoService;
-    private IBstIvtBoxinfoService iBstIvtBoxinfoService;
 
     /**
      * 任务服务
      */
-    @Autowired
+    private final IschBaseTaskService ischBaseTaskService;
-    private IschBaseTaskService ischBaseTaskService;
 
     @Override
     @Transactional

lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/LashManageServiceImpl.java

@@ -46,11 +46,6 @@ public class LashManageServiceImpl implements LashManageService {
      */
     private final IBstIvtBoxinfoService iBstIvtBoxinfoService;
 
-    /**
-     * 点位服务
-     */
-    private final IschBasePointService ischBasePointService;
-
     /**
      * 点位mapper服务
      */
@@ -134,7 +129,7 @@ public class LashManageServiceImpl implements LashManageService {
             }
 
             end_point = jsonPoint.getString("point_code");
-            ischBasePointService.updateById(JSON.parseObject(jsonPoint.toString(), SchBasePoint.class));
+            schBasePointMapper.updateById(JSON.parseObject(jsonPoint.toString(), SchBasePoint.class));
 
             // 查询此点位绑定木箱表
             BstIvtBoxlashbound boundDao = iBstIvtBoxlashboundService.getOne(
@@ -166,7 +161,7 @@ public class LashManageServiceImpl implements LashManageService {
                 jsonPoint.put("vehicle_code",boxDao.getBox_no());
 
                 end_point = jsonPoint.getString("point_code");
-                ischBasePointService.updateById(JSON.parseObject(jsonPoint.toString(), SchBasePoint.class));
+                schBasePointMapper.updateById(JSON.parseObject(jsonPoint.toString(), SchBasePoint.class));
                 /*
                  * 插入绑定木箱表
                  */

lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBoxManageServiceImpl.java

@@ -16,6 +16,7 @@ import org.nl.common.utils.IdUtil;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.wql.WQL;
 import org.nl.modules.wql.core.bean.WQLObject;
+import org.nl.modules.wql.util.SpringContextHolder;
 import org.nl.wms.pda.mps.eum.RegionTypeEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -486,7 +487,8 @@ public class OutBoxManageServiceImpl implements OutBoxManageService {
         paramIn.put("stor_id", IOSEnum.STOR_ID.code("二期"));
         paramIn.put("sect_id", RegionTypeEnum.TWO_MX01.getId());
 
-        JSONObject jsonAttr = new InBoxManageServiceImpl().getStruct(paramIn);
+        InBoxManageServiceImpl bean = SpringContextHolder.getBean(InBoxManageServiceImpl.class);
+        JSONObject jsonAttr = bean.getStruct(paramIn);
 
         if (ObjectUtil.isEmpty(jsonAttr)) {
             throw new BadRequestException("木箱移库任务生成失败，没有空位!");

lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutVehicleManageServiceImpl.java

@@ -128,7 +128,7 @@ public class OutVehicleManageServiceImpl implements OutVehicleManageService {
         JSONObject jsonParam = new JSONObject();
         jsonParam.put("stor_id", IOSEnum.STOR_ID.code("二期"));
         jsonParam.put("sect_id", RegionTypeEnum.TWO_TTP01.getId());
-        jsonParam.put("vehicle_type", taskDao.getVehicle_type());
+        jsonParam.put("storagevehicle_type", taskDao.getVehicle_type());
 
         // 调用找货位方法
         JSONObject jsonAttrNow = getStruct(jsonParam);

lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java

@@ -10,6 +10,7 @@ import org.nl.b_lms.storage_manage.ios.service.iostorInv.util.impl.*;
 import org.nl.b_lms.storage_manage.ios.service.iostorInv.util.service.InBussManageService;
 import org.nl.b_lms.storage_manage.ios.service.iostorInv.util.service.LashManageService;
 import org.nl.modules.logging.annotation.Log;
+import org.nl.modules.wql.util.SpringContextHolder;
 import org.nl.wms.st.inbill.service.CheckOutBillService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
@@ -388,7 +389,8 @@ public class CheckOutBillController {
     @PostMapping("/testInBox")
     @Log("木箱入库测试")
     public ResponseEntity<Object> testInBox(@RequestBody JSONObject whereJson) {
-        new InBoxManageServiceImpl().inBox(whereJson);
+        InBoxManageServiceImpl bean = SpringContextHolder.getBean(InBoxManageServiceImpl.class);
+        bean.inBox(whereJson);
         return new ResponseEntity<>(HttpStatus.OK);
     }