移库任务记录任务类型，托盘号

ruoyi-ui/src/views/ams/task/index.vue

@@ -263,6 +263,7 @@
           <div v-if="scope.row.ext7 === '5'">入库</div>
           <div v-if="scope.row.ext7 === '6'">出库</div>
           <div v-if="scope.row.ext7 === '9'">回库</div>
+          <div v-if="scope.row.ext7 === '10'">移库</div>
         </template>
       </el-table-column>
       <el-table-column label="托盘号" align="center" prop="ext5" />
@@ -558,7 +559,8 @@ export default {
       taskTypeCombo: [
         {'label':'入库','value':'5'},
         {'label':'出库','value':'6'},
-        {'label':'回库','value':'9'}
+        {'label':'回库','value':'9'},
+        {'label':'移库','value':'10'}
       ],
       isYesAndNoCombo: [
         {'label':'是','value':'Y'},

warewms-ams/src/main/java/com/ruoyi/ams/inv/service/impl/InvLotLocIdServiceImpl.java

@@ -272,6 +272,8 @@ public class InvLotLocIdServiceImpl implements IInvLotLocIdService {
         wcsTask.setBusinessType("01");
         wcsTask.setTaskType(Constant.TASK_TYPE.FORWARD.getValue());
         wcsTask.setExt8("");
+        wcsTask.setExt7("10"); // 任务类型 10代表移库
+        wcsTask.setExt5(palletNo); // 托盘号
         iBusinessService.addTask(wcsTask);
 
         // 锁定起始和目标库位任务状态

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

@@ -203,7 +203,7 @@ public class WcsTaskServiceImpl implements IWcsTaskService {
     @Transactional
     @Override
     public void callBackTaskComplete(WcsTask wcsTask) {
-        if (StringUtils.isEmpty(wcsTask.getExt5())) {
+        if (StringUtils.isEmpty(wcsTask.getExt7())) {
             wcsTask.setExt5("9999");
         }
         switch (wcsTask.getExt7()) {
@@ -229,6 +229,9 @@ public class WcsTaskServiceImpl implements IWcsTaskService {
                 // 修改批次lotatt15（出库单号）为空
                 invLotLocIdService.clearInvActOrderNoByPalletNo(wcsTask.getExt5());
                 break;
+                // 移库
+            case "10":
+                break;
             default:
                 break;
         }

warewms-ams/src/main/resources/mapper/box/WmsBoxInfoMapper.xml

@@ -142,7 +142,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="locationTo != null">location_id = #{locationTo},</if>
             <if test="isFull != null">is_full = #{isFull},</if>
         </trim>
-        where location_id = #{locationFrom} and box_no =#{palletNo}
+        where box_no =#{palletNo}
+--         where location_id = #{locationFrom} and box_no =#{palletNo}
     </update>
 
     <update id="unbindBox">