From 6378186e613177b2c2ffbb9374ec70c3e3c38303 Mon Sep 17 00:00:00 2001
From: liangzhou <594755172@qq.com>
Date: Sun, 23 Feb 2025 19:38:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=87=BA=E5=BA=93=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/app/AppPmsController.java  | 58 ++++++++++++-------
 .../resources/mapper/app/AppTaskBakMapper.xml |  7 ++-
 .../resources/mapper/app/AppTaskMapper.xml    | 10 +++-
 3 files changed, 51 insertions(+), 24 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsController.java
index e5c951f1..52fefd42 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsController.java
@@ -1,9 +1,6 @@
 package com.ruoyi.web.controller.app;
 
-import com.ruoyi.app.domain.AppLocation;
-import com.ruoyi.app.domain.AppPendingStorage;
-import com.ruoyi.app.domain.AppPmsOrderIn;
-import com.ruoyi.app.domain.AppTask;
+import com.ruoyi.app.domain.*;
 import com.ruoyi.app.service.IAppPendingStorageService;
 import com.ruoyi.app.service.IAppPmsOrderInService;
 import com.ruoyi.app.service.IAppPmsOrderOutService;
@@ -37,8 +34,7 @@ import java.util.*;
  */
 @RestController
 @RequestMapping("/app/pms")
-public class AppPmsController extends BaseController
-{
+public class AppPmsController extends BaseController {
     @Autowired
     private IAppPmsOrderInService appPmsOrderInService;// 入库单
     @Autowired
@@ -56,19 +52,18 @@ public class AppPmsController extends BaseController
     @Log(title = "Pms入库单请求", skipAuth = true)
     @PostMapping("/orderIn")
     @Anonymous
-    public AjaxResult pmsOrderIn(@RequestBody PmsOrderInRequest orderInRequest)
-    {
+    public AjaxResult pmsOrderIn(@RequestBody PmsOrderInRequest orderInRequest) {
         // TODO
         // 判断数据是否缺失
         Integer orderType = orderInRequest.getOrderType();
         if (StringUtils.isEmpty(orderInRequest.getListId())
-        || !orderInTypeList.contains(orderInRequest.getOrderType())
-        || StringUtils.isEmpty(orderInRequest.getCustomerId())
-        || StringUtils.isEmpty(orderInRequest.getOrderId())
-        || StringUtils.isEmpty(orderInRequest.getGoodsId())
-        || StringUtils.isEmpty(orderInRequest.getGoodsCode())
-        || StringUtils.isEmpty(orderInRequest.getGoodsDesc())
-        || orderInRequest.getGoodsNum() == null) {
+                || !orderInTypeList.contains(orderInRequest.getOrderType())
+                || StringUtils.isEmpty(orderInRequest.getCustomerId())
+                || StringUtils.isEmpty(orderInRequest.getOrderId())
+                || StringUtils.isEmpty(orderInRequest.getGoodsId())
+                || StringUtils.isEmpty(orderInRequest.getGoodsCode())
+                || StringUtils.isEmpty(orderInRequest.getGoodsDesc())
+                || orderInRequest.getGoodsNum() == null) {
             return error("缺少请求数据。");
         }
         // 判断入库单号是否重复
@@ -77,7 +72,7 @@ public class AppPmsController extends BaseController
             return error("入库单号重复。");
         }
         AppPmsOrderIn appPmsOrderIn = new AppPmsOrderIn();
-        BeanUtils.copyProperties(orderInRequest,appPmsOrderIn);
+        BeanUtils.copyProperties(orderInRequest, appPmsOrderIn);
         appPmsOrderIn.setOrderType(Long.valueOf(orderInRequest.getOrderType()));
         appPmsOrderIn.setGoodsNum(BigDecimal.valueOf(orderInRequest.getGoodsNum()));
         appPmsOrderIn.setUsedNum(BigDecimal.valueOf(0));
@@ -103,13 +98,32 @@ public class AppPmsController extends BaseController
     @Log(title = "Pms出库单请求", skipAuth = true)
     @PostMapping("/orderOut")
     @Anonymous
-    public AjaxResult pmsOrderOut(@RequestBody PmsOrderOutRequest orderOutRequest)
-    {
+    public AjaxResult pmsOrderOut(@RequestBody PmsOrderOutRequest orderOutRequest) {
         // TODO
+        // 判断请求数据完整性
+        if (StringUtils.isEmpty(orderOutRequest.getListId())
+                || orderOutRequest.getOrderType() == null
+                || StringUtils.isEmpty(orderOutRequest.getCustomerId())
+                || StringUtils.isEmpty(orderOutRequest.getGoodsId())
+                || orderOutRequest.getGoodsNum() == null
+                || StringUtils.isEmpty(orderOutRequest.getGoodsDesc())) {
+            return error("请求数据不完整。");
+        }
+        // 判断入库单号是否重复
+        AppPmsOrderOut existAppPmsOrderOut = appPmsOrderOutService.selectAppPmsOrderOutByListId(orderOutRequest.getListId());
+        if (existAppPmsOrderOut != null) {
+            return error("出库单号重复。");
+        }
+        AppPmsOrderOut appPmsOrderOut = new AppPmsOrderOut();
+        appPmsOrderOut.setListId(orderOutRequest.getListId());
+        appPmsOrderOut.setOrderType(Long.valueOf(orderOutRequest.getOrderType()));
+        appPmsOrderOut.setCustomerId(orderOutRequest.getCustomerId());
+        appPmsOrderOut.setGoodsId(orderOutRequest.getGoodsId());
+        appPmsOrderOut.setGoodsNum(BigDecimal.valueOf(orderOutRequest.getGoodsNum()));
+        appPmsOrderOut.setGoodsDesc(orderOutRequest.getGoodsDesc());
+        appPmsOrderOut.setCreateTime(new Date());
+        appPmsOrderOut.setUpdateTime(new Date());
 
-
-
-
-        return success();
+        return toAjax(appPmsOrderOutService.insertAppPmsOrderOut(appPmsOrderOut));
     }
 }
diff --git a/ruoyi-system/src/main/resources/mapper/app/AppTaskBakMapper.xml b/ruoyi-system/src/main/resources/mapper/app/AppTaskBakMapper.xml
index 4a53c0d1..f6637176 100644
--- a/ruoyi-system/src/main/resources/mapper/app/AppTaskBakMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/app/AppTaskBakMapper.xml
@@ -20,10 +20,11 @@
         <result property="stockNum"    column="stock_num"    />
         <result property="opUser"    column="op_user"    />
         <result property="preTask"    column="pre_task"    />
+        <result property="remark"    column="remark"    />
     </resultMap>
 
     <sql id="selectAppTaskBakVo">
-        select task_id, task_type, task_status, task_priority, vehicle_id, origin, destination, wcs_task_id, create_time, finish_time, goods_id, op_num, stock_num, op_user, pre_task from app_task_bak
+        select task_id, task_type, task_status, task_priority, vehicle_id, origin, destination, wcs_task_id, create_time, finish_time, goods_id, op_num, stock_num, op_user, pre_task, remark from app_task_bak
     </sql>
 
     <select id="selectAppTaskBakList" parameterType="AppTaskBak" resultMap="AppTaskBakResult">
@@ -42,6 +43,7 @@
             <if test="stockNum != null "> and stock_num = #{stockNum}</if>
             <if test="opUser != null  and opUser != ''"> and op_user = #{opUser}</if>
             <if test="preTask != null  and preTask != ''"> and pre_task = #{preTask}</if>
+            <if test="remark != null  and remark != ''"> and remark = #{remark}</if>
         </where>
     </select>
 
@@ -68,6 +70,7 @@
             <if test="stockNum != null">stock_num,</if>
             <if test="opUser != null">op_user,</if>
             <if test="preTask != null">pre_task,</if>
+            <if test="remark != null">remark,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="taskId != null">#{taskId},</if>
@@ -85,6 +88,7 @@
             <if test="stockNum != null">#{stockNum},</if>
             <if test="opUser != null">#{opUser},</if>
             <if test="preTask != null">#{preTask},</if>
+            <if test="remark != null">#{remark},</if>
         </trim>
     </insert>
 
@@ -105,6 +109,7 @@
             <if test="stockNum != null">stock_num = #{stockNum},</if>
             <if test="opUser != null">op_user = #{opUser},</if>
             <if test="preTask != null">pre_task = #{preTask},</if>
+            <if test="remark != null">remark = #{remark},</if>
         </trim>
         where task_id = #{taskId}
     </update>
diff --git a/ruoyi-system/src/main/resources/mapper/app/AppTaskMapper.xml b/ruoyi-system/src/main/resources/mapper/app/AppTaskMapper.xml
index 20680cc5..a7d31605 100644
--- a/ruoyi-system/src/main/resources/mapper/app/AppTaskMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/app/AppTaskMapper.xml
@@ -21,10 +21,11 @@
         <result property="opUser"    column="op_user"    />
         <result property="opUser"    column="op_user"    />
         <result property="preTask"    column="pre_task"    />
+        <result property="remark"    column="remark"    />
     </resultMap>
 
     <sql id="selectAppTaskVo">
-        select task_id, task_type, task_status, task_priority, vehicle_id, origin, destination, wcs_task_id, create_time, finish_time, goods_id, op_num, stock_num, op_user, pre_task from app_task
+        select task_id, task_type, task_status, task_priority, vehicle_id, origin, destination, wcs_task_id, create_time, finish_time, goods_id, op_num, stock_num, op_user, pre_task, remark from app_task
     </sql>
 
     <select id="selectAppTaskList" parameterType="AppTask" resultMap="AppTaskResult">
@@ -43,6 +44,7 @@
             <if test="stockNum != null "> and stock_num = #{stockNum}</if>
             <if test="opUser != null  and opUser != ''"> and op_user = #{opUser}</if>
             <if test="preTask != null  and preTask != ''"> and pre_task = #{preTask}</if>
+            <if test="remark != null  and remark != ''"> and remark = #{remark}</if>
         </where>
     </select>
 
@@ -69,6 +71,7 @@
             <if test="stockNum != null">stock_num,</if>
             <if test="opUser != null">op_user,</if>
             <if test="preTask != null">pre_task,</if>
+            <if test="remark != null">remark,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="taskId != null">#{taskId},</if>
@@ -86,6 +89,7 @@
             <if test="stockNum != null">#{stockNum},</if>
             <if test="opUser != null">#{opUser},</if>
             <if test="preTask != null">#{preTask},</if>
+            <if test="remark != null">#{remark},</if>
         </trim>
     </insert>
 
@@ -109,6 +113,7 @@
                 <if test="appTask.stockNum != null">stock_num,</if>
                 <if test="appTask.opUser != null">op_user,</if>
                 <if test="appTask.preTask != null">pre_task,</if>
+                <if test="appTask.remark != null">remark,</if>
             </trim>
             )
             values
@@ -129,6 +134,7 @@
                 <if test="appTask.stockNum != null">#{appTask.stockNum},</if>
                 <if test="appTask.opUser != null">#{appTask.opUser},</if>
                 <if test="appTask.preTask != null">#{appTask.preTask},</if>
+                <if test="appTask.remark != null">#{appTask.remark},</if>
             </trim>
             )
         </foreach>
@@ -152,6 +158,7 @@
             <if test="stockNum != null">stock_num = #{stockNum},</if>
             <if test="opUser != null">op_user = #{opUser},</if>
             <if test="preTask != null">pre_task = #{preTask},</if>
+            <if test="remark != null">remark = #{remark},</if>
         </trim>
         where task_id = #{taskId}
     </update>
@@ -174,6 +181,7 @@
                 <if test="appTask.stockNum != null">stock_num = #{appTask.stockNum},</if>
                 <if test="appTask.opUser != null">op_user = #{appTask.opUser},</if>
                 <if test="appTask.preTask != null">pre_task = #{appTask.preTask},</if>
+                <if test="appTask.remark != null">remark = #{appTask.remark},</if>
             </trim>
             where task_id = #{appTask.taskId}
         </foreach>