Merge branch 'master' of http://112.4.208.194:3000/FeiDaBaoKai/wms_serve_xugongteji

ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsController.java

@@ -309,6 +309,7 @@ public class AppPmsController extends BaseController {
     @Anonymous
     @PostMapping("/pmsStockInComplete")
     public AjaxResult pmsStockInComplete(@RequestBody PmsStockInCompleteReq request) {
+        logger.info("请求码盘,码盘请求信息：{}", JSON.toJSONString(request));
         return toAjax(appPmsOrderInService.pmsStockInComplete(request));
     }
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppTaskController.java

@@ -4,6 +4,7 @@ import java.math.BigDecimal;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
 import javax.servlet.http.HttpServletResponse;
+import javax.xml.stream.Location;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson2.JSON;
@@ -185,7 +186,6 @@ public class AppTaskController extends BaseController
     @Anonymous
     public AjaxResult receiveTaskResult(@RequestBody TaskResultFeedRequest feedBackRequest)
     {
-        logger.info("反馈任务状态：{}", JSON.toJSONString(feedBackRequest));
         // 判断请求参数是否齐全
         if (feedBackRequest == null
         || StringUtils.isEmpty(feedBackRequest.getTaskId())
@@ -196,18 +196,15 @@ public class AppTaskController extends BaseController
         }
         // 判断任务状态是否正确
         if (!wcsTaskStatusList.contains(feedBackRequest.getTaskStatus())) {
-            logger.info("任务状态码反馈不正确。");
             return error("任务状态码反馈不正确。");
         }
         // 查询任务号
         AppWcsTask thisFbWcsTask = appWcsTaskService.selectAppWcsTaskByWcsTaskId(feedBackRequest.getTaskId());
         if (thisFbWcsTask == null) {
-            logger.info("反馈的任务号不存在。");
             return error("反馈的任务号不存在。");
         }
         // 判断反馈的任务号与数据库中是否一致
         if (Objects.equals(thisFbWcsTask.getWcsTaskStatus(), feedBackRequest.getTaskStatus())) {
-            logger.info("请勿重复反馈相同任务状态。");
             return error("请勿重复反馈相同任务状态。");
         }
         AppTask wmsTaskQuery = new AppTask();
@@ -238,7 +235,6 @@ public class AppTaskController extends BaseController
                // appTaskService.batchUpdateAppTask(thisWmsTaskList);
                 updateAppTask(thisWmsTaskList);
             }
-            logger.info("反馈任务完成成功。");
             return success("反馈任务完成成功。");
         }
         if (998 == feedBackRequest.getTaskStatus()) {
@@ -254,7 +250,6 @@ public class AppTaskController extends BaseController
 //                appTaskService.batchUpdateAppTask(thisWmsTaskList);
                 updateAppTask(thisWmsTaskList);
             }
-            logger.info("反馈任务取消成功。");
             return success("反馈任务取消成功。");
         }
         if (999 == feedBackRequest.getTaskStatus()) {
@@ -269,7 +264,6 @@ public class AppTaskController extends BaseController
 //                appTaskService.batchUpdateAppTask(thisWmsTaskList);
                 updateAppTask(thisWmsTaskList);
             }
-            logger.info("反馈任务异常成功。");
             return success("反馈任务异常成功。");
         }
 
@@ -333,7 +327,11 @@ public class AppTaskController extends BaseController
             if(i == 0 ){
                 return error("wcs生成入库任务异常");
             }
-
+            // 占用库位
+            AppLocation updateLocation = new AppLocation();
+            updateLocation.setLocationId(location.getLocationId());
+            updateLocation.setLocationStatus(1);
+            appLocationService.updateAppLocation(updateLocation);
             WcsDate wcsDate = new WcsDate();
             wcsDate.setTaskId(appTask2.getTaskId());
             wcsDate.setUser("WMS");
@@ -390,6 +388,12 @@ public class AppTaskController extends BaseController
         wcsDate.setUser("WMS");
         wcsDate.setVehicleNo(wcsStackerTask.getVehicleNo());
         wcsDate.setDestination(location.getLocationId());
+        // 占用库位
+        AppLocation updateLocation = new AppLocation();
+        updateLocation.setLocationId(location.getLocationId());
+        updateLocation.setLocationStatus(1);
+        appLocationService.updateAppLocation(updateLocation);
+        logger.info("更新库位成功");
         return success(wcsDate);
     }
 
@@ -1029,9 +1033,10 @@ public class AppTaskController extends BaseController
                     }
                     // 创建移库任务
                     moveTask.setTaskId(IdUtils.fastUUID());
-                    moveTask.setTaskType(3);
+                    moveTask.setTaskType(9);
                     moveTask.setTaskStatus(0);
-                    moveTask.setTaskPriority(1);
+                    // 设置移库任务优先级
+                    moveTask.setTaskPriority(2);
                     moveTask.setVehicleId(moveLocation.getVehicleId());
                     moveTask.setOrigin(moveLocation.getLocationId());
                     moveTask.setDestination(moveDestination.getLocationId());

ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/TaskExecutor.java

@@ -48,7 +48,7 @@ public class TaskExecutor {
     private final HashMap<Integer, Integer> taskTypeMap = new HashMap<Integer, Integer>() {{
         put(1, 1);// 入库
         put(2, 2);// 出库
-        put(3, 3);// 移库
+        put(9, 9);// 移库
     }};
     @Autowired
     private AppLocationMapper appLocationMapper;

ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppLocationServiceImpl.java

@@ -127,6 +127,8 @@ public class AppLocationServiceImpl implements IAppLocationService {
         locationQuery.setIsWorking(0);
         locationQuery.setLocationStatus(0);
         locationQuery.setIsLock(0);
+        // todo 先放进二深度后
+        locationQuery.setwDepth(2);
         List<AppLocation> appLocationList = appLocationMapper.selectAppLocationList(locationQuery);
         if (appLocationList == null || appLocationList.isEmpty()) {
             return null;

ruoyi-system/src/main/resources/mapper/app/AppLocationMapper.xml

@@ -189,9 +189,8 @@
     <update id="updateAppLocation" parameterType="AppLocation">
         update app_location
         <trim prefix="SET" suffixOverrides=",">
-            <if test="locationId != null">location_id = #{locationId},</if>
-            <if test="locationType != null">location_type = #{locationType},</if>
             <if test="locationStatus != null">location_status = #{locationStatus},</if>
+            <if test="locationType != null">location_type = #{locationType},</if>
             <if test="outerId != null">outer_id = #{outerId},</if>
             <if test="areaId != null">area_id = #{areaId},</if>
             <if test="tunnelId != null">tunnel_id = #{tunnelId},</if>
@@ -206,7 +205,7 @@
             <if test="isWorking != null">is_working = #{isWorking},</if>
             <if test="isEnable != null">is_enable = #{isEnable},</if>
         </trim>
-        where id = #{id}
+      where location_id = #{locationId}
     </update>
 
 

ruoyi-system/src/main/resources/mapper/app/AppPmsOrderInMapper.xml

@@ -150,7 +150,7 @@ or goods_code like concat('%',#{param},'%') or goods_desc like concat('%',#{para
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="remark != null">remark = #{remark},</if>
         </trim>
-        where id = #{id}
+        where list_id = #{listId}
     </update>
 
     <delete id="deleteAppPmsOrderInById" parameterType="String">

ruoyi-system/src/main/resources/mapper/app/AppWcsTaskMapper.xml

@@ -73,38 +73,38 @@
 
     <insert id="batchInsertAppWcsTask" parameterType="java.util.List">
         insert into app_wcs_task
-        <foreach collection="list" item="appWcsTask" separator=",">
-            (
-            <trim suffixOverrides=",">
-                <if test="appWcsTask.wcsTaskId != null">wcs_task_id,</if>
-                <if test="appWcsTask.wcsTaskStatus != null">wcs_task_status,</if>
-                <if test="appWcsTask.wcsTaskType != null">wcs_task_type,</if>
-                <if test="appWcsTask.taskPriority != null">task_priority,</if>
-                <if test="appWcsTask.vehicleId != null">vehicle_id,</if>
-                <if test="appWcsTask.origin != null">origin,</if>
-                <if test="appWcsTask.destination != null">destination,</if>
-                <if test="appWcsTask.createTime != null">create_time,</if>
-                <if test="appWcsTask.sendTime != null">send_time,</if>
-                <if test="appWcsTask.finishTime != null">finish_time,</if>
-                <if test="appWcsTask.remark != null">remark,</if>
-            </trim>
-            )
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="list != null and list.size() > 0">
+                <if test="list[0].wcsTaskId != null">wcs_task_id,</if>
+                <if test="list[0].wcsTaskStatus != null">wcs_task_status,</if>
+                <if test="list[0].wcsTaskType != null">wcs_task_type,</if>
+                <if test="list[0].taskPriority != null">task_priority,</if>
+                <if test="list[0].vehicleId != null and list[0].vehicleId!=''">vehicle_id,</if>
+                <if test="list[0].origin != null">origin,</if>
+                <if test="list[0].destination != null">destination,</if>
+                <if test="list[0].createTime != null">create_time,</if>
+                <if test="list[0].sendTime != null">send_time,</if>
+                <if test="list[0].finishTime != null">finish_time,</if>
+                <if test="list[0].remark != null">remark,</if>
+            </if>
+        </trim>
             values
-            (
-            <trim suffixOverrides=",">
-                <if test="appWcsTask.wcsTaskId != null">#{appWcsTask.wcsTaskId},</if>
-                <if test="appWcsTask.wcsTaskStatus != null">#{appWcsTask.wcsTaskStatus},</if>
-                <if test="appWcsTask.wcsTaskType != null">#{appWcsTask.wcsTaskType},</if>
-                <if test="appWcsTask.taskPriority != null">#{appWcsTask.taskPriority},</if>
-                <if test="appWcsTask.vehicleId != null">#{appWcsTask.vehicleId},</if>
-                <if test="appWcsTask.origin != null">#{appWcsTask.origin},</if>
-                <if test="appWcsTask.destination != null">#{appWcsTask.destination},</if>
-                <if test="appWcsTask.createTime != null">#{appWcsTask.createTime},</if>
-                <if test="appWcsTask.sendTime != null">#{appWcsTask.sendTime},</if>
-                <if test="appWcsTask.finishTime != null">#{appWcsTask.finishTime},</if>
-                <if test="appWcsTask.remark != null">#{appWcsTask.remark},</if>
+        <foreach collection="list" item="appWcsTask" separator=",">
+            <trim prefix="(" suffix=")" suffixOverrides=",">
+                <trim suffixOverrides=",">
+                    <if test="appWcsTask.wcsTaskId != null">#{appWcsTask.wcsTaskId},</if>
+                    <if test="appWcsTask.wcsTaskStatus != null">#{appWcsTask.wcsTaskStatus},</if>
+                    <if test="appWcsTask.wcsTaskType != null">#{appWcsTask.wcsTaskType},</if>
+                    <if test="appWcsTask.taskPriority != null">#{appWcsTask.taskPriority},</if>
+                    <if test="appWcsTask.vehicleId != null and list[0].vehicleId != ''">#{appWcsTask.vehicleId},</if>
+                    <if test="appWcsTask.origin != null">#{appWcsTask.origin},</if>
+                    <if test="appWcsTask.destination != null">#{appWcsTask.destination},</if>
+                    <if test="appWcsTask.createTime != null">#{appWcsTask.createTime},</if>
+                    <if test="appWcsTask.sendTime != null">#{appWcsTask.sendTime},</if>
+                    <if test="appWcsTask.finishTime != null">#{appWcsTask.finishTime},</if>
+                    <if test="appWcsTask.remark != null">#{appWcsTask.remark},</if>
+                </trim>
             </trim>
-            )
         </foreach>
     </insert>