华兰：调试修改

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/pda/PdaDocAsnController.java

@@ -1,17 +1,11 @@
 package com.ruoyi.web.controller.warewms.pda;
 
 import com.ruoyi.ams.business.IBusinessService;
-import com.ruoyi.ams.config.domain.dto.AgvCallDTO;
 import com.ruoyi.ams.config.domain.dto.AgvCallItem;
-import com.ruoyi.ams.config.domain.dto.AgvCallItemDTO;
-import com.ruoyi.ams.config.domain.vo.FlowConfigHeaderVO;
-import com.ruoyi.ams.config.service.IFlowConfigHeaderService;
-import com.ruoyi.base.constant.Constant;
 import com.ruoyi.common.core.domain.AjaxResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -19,9 +13,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * @author JWK
  * @version 1.0
@@ -37,8 +28,6 @@ public class PdaDocAsnController {
 
     @Autowired
     private IBusinessService businessService;
-    @Autowired
-    private IFlowConfigHeaderService flowConfigHeaderService;
 
     @ApiOperation("入库位->接驳位任务下发")
     @PostMapping("inToTran")

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/pda/PdaDocSoController.java

@@ -1,27 +1,17 @@
 package com.ruoyi.web.controller.warewms.pda;
 
-import com.ruoyi.ams.asn.service.IWmsDocAsnHeaderService;
 import com.ruoyi.ams.business.IBusinessService;
-import com.ruoyi.ams.config.domain.dto.AgvCallDTO;
 import com.ruoyi.ams.config.domain.dto.AgvCallItem;
-import com.ruoyi.ams.config.domain.dto.AgvCallItemDTO;
-import com.ruoyi.ams.config.domain.vo.FlowConfigHeaderVO;
-import com.ruoyi.ams.config.service.IFlowConfigHeaderService;
-import com.ruoyi.base.constant.Constant;
 import com.ruoyi.common.core.domain.AjaxResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * @author JWK
  * @version 1.0
@@ -37,8 +27,6 @@ public class PdaDocSoController {
 
     @Autowired
     private IBusinessService businessService;
-    @Autowired
-    private IFlowConfigHeaderService flowConfigHeaderService;
 
     @ApiOperation("出库位->接驳位任务下发")
     @PostMapping("outToTran")

warewms-ams/src/main/java/com/ruoyi/ams/task/service/impl/WcsTaskServiceImpl.java

@@ -297,6 +297,7 @@ public class WcsTaskServiceImpl implements IWcsTaskService {
         return wcsTaskMapper.selectTaskByColNoAfter(colNo, colIndex, zoneId, warehouseId);
     }
 
+    @Transactional
     @Override
     public void callBack(String taskNo, Integer state, Integer carNo) {
         String updateBy = "NDC";
@@ -402,6 +403,7 @@ public class WcsTaskServiceImpl implements IWcsTaskService {
                 if (!StringUtils.isEmpty(wcsTask.getExt8())) {
                     redisCache.unlockCacheObject(Long.parseLong(wcsTask.getExt8()));
                 }
+                throw new RuntimeException();
             }
         } else {
 

warewms-ams/src/main/resources/mapper/ams/InvLotLocIdMapper.xml

@@ -366,17 +366,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where location_id = #{locationFrom}
     </update>
 
-    <update id="moveInvByLocationId">
+    <update id="moveInvByLocationId"  parameterType="Object">
         update inv_lot_loc_id
-        set locationid = #{locationTo}
-       where locationid = #{locationFrom} and traceid = #{traceid}
+        set location_id = #{locationTo},traceid = #{traceid}
+       where location_id = #{locationFrom}
     </update>
 
-    <update id="moveInvByTraceId">
+    <update id="moveInvByTraceId" parameterType="Object">
         update inv_lot_loc_id
-        set locationid = #{locationTo}
-          ,traceid = #{traceid}
-        where locationid = #{locationFrom}
+        set location_id = #{locationTo}
+        where location_id = #{locationFrom} and traceid = #{traceid}
     </update>
 
     <update id="updateInvLotLocIdLotnum">