From 61f775940ead423bf456afb4ff7cbb6249e35923 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Mon, 11 Nov 2024 20:26:04 +0800
Subject: [PATCH] =?UTF-8?q?11/11=20bug=E4=BC=98=E5=8C=961.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../auth/SysWorkplaceQueueController.java       | 17 +++++++++--------
 .../inout/IoOrderDetailBizController.java       |  6 ++++++
 .../api/req/inout/AddBizProductReqeust.java     |  2 ++
 .../mapper/basic/SysWorkplaceQueueMapper.xml    |  6 ++++++
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/auth/SysWorkplaceQueueController.java b/src/main/java/com/glxp/api/controller/auth/SysWorkplaceQueueController.java
index 198aa0fdf..ea87a5561 100644
--- a/src/main/java/com/glxp/api/controller/auth/SysWorkplaceQueueController.java
+++ b/src/main/java/com/glxp/api/controller/auth/SysWorkplaceQueueController.java
@@ -93,8 +93,6 @@ public class SysWorkplaceQueueController extends BaseController {
 
     @GetMapping("/udiwms/sysWorkplaceQueue/getQueueBindList")
     public BaseResponse getQueueBindList(SysWorkplaceQueueRequest request) {
-
-
         String scanCode = request.getScanCode();
         if (StrUtil.isNotEmpty(scanCode)){
             UdiEntity udi = FilterUdiUtils.getUdi(scanCode);
@@ -113,12 +111,15 @@ public class SysWorkplaceQueueController extends BaseController {
 
     @GetMapping("/udiwms/sysWorkplaceQueue/getByCode")
     public BaseResponse getByCode(SysWorkplaceQueueRequest request) {
-        SysWorkplaceQueue sysWorkplaceQueue =
-                sysWorkplaceQueueService.getOne(new LambdaQueryWrapper<SysWorkplaceQueue>().eq(SysWorkplaceQueue::getCode, request.getCode()).eq(SysWorkplaceQueue::getWorkPlaceIdFk,request.getWorkPlaceIdFk()));
-        if (sysWorkplaceQueue != null) {
-            return ResultVOUtils.success(sysWorkplaceQueue);
+        List<SysWorkplaceQueueResponse> list = sysWorkplaceQueueService.filterBindList(request);
+        if (list.size() == 0){
+            return ResultVOUtils.error("当前工位未绑定取货槽！");
+        }
+        SysWorkplaceQueueResponse sysWorkplaceQueueResponse = list.get(0);
+        if (sysWorkplaceQueueResponse != null) {
+            return ResultVOUtils.success(sysWorkplaceQueueResponse);
         } else {
-            return ResultVOUtils.error("当前工位未绑定货位！");
+            return ResultVOUtils.error("当前工位未绑定取货槽！");
         }
     }
 
@@ -126,7 +127,7 @@ public class SysWorkplaceQueueController extends BaseController {
     @PostMapping("/udiwms/sysWorkplaceQueue/addQueue")
     public BaseResponse addQueue(@RequestBody SysWorkplaceQueue sysWorkplaceQueue) {
         // 创建时间 更新时间
-        sysWorkplaceQueue.setCreateTime(new Date());
+//        sysWorkplaceQueue.setCreateTime(new Date());
         sysWorkplaceQueue.setCreateUser(getUserId() + "");
         sysWorkplaceQueue.setUpdateUser(getUserId() + "");
         sysWorkplaceQueue.setUpdateTime(new Date());
diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java
index b86bd327f..c91d209d5 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java
@@ -170,6 +170,12 @@ public class IoOrderDetailBizController extends BaseController {
             orderEntity.setDeptCode(invWarehouseEntity.getParentId());
             orderEntity.setInvCode(orderEntity.getInvCode());
             orderEntity.setBusType(bussinessTypeEntity.getBusType());
+            if (addBizProductReqeust.getProductType() == null){
+                orderEntity.setProductType(1);
+            }else {
+                orderEntity.setProductType(addBizProductReqeust.getProductType());
+            }
+
 
             orderService.insertOrder(orderEntity);
         }
diff --git a/src/main/java/com/glxp/api/req/inout/AddBizProductReqeust.java b/src/main/java/com/glxp/api/req/inout/AddBizProductReqeust.java
index 93ff22647..efe761e70 100644
--- a/src/main/java/com/glxp/api/req/inout/AddBizProductReqeust.java
+++ b/src/main/java/com/glxp/api/req/inout/AddBizProductReqeust.java
@@ -19,6 +19,8 @@ public class AddBizProductReqeust {
     private String productDate;
     private String expireDate;
 
+    private Integer productType;
+
 
     /**
      * 数量
diff --git a/src/main/resources/mybatis/mapper/basic/SysWorkplaceQueueMapper.xml b/src/main/resources/mybatis/mapper/basic/SysWorkplaceQueueMapper.xml
index 5e7e87871..32e7fad9b 100644
--- a/src/main/resources/mybatis/mapper/basic/SysWorkplaceQueueMapper.xml
+++ b/src/main/resources/mybatis/mapper/basic/SysWorkplaceQueueMapper.xml
@@ -57,6 +57,12 @@
             <if test=" layerCode != null and layerCode != ''">
                 AND layerCode = #{layerCode}
             </if>
+            <if test=" code != null and code != ''">
+                AND swq.code = #{code}
+            </if>
+            <if test=" workPlaceIdFk != null and workPlaceIdFk != ''">
+                AND swq.workPlaceIdFk = #{workPlaceIdFk}
+            </if>
             <if test="layerCodes != null and layerCodes.size() > 0">
                 and swq.layerCode in
                 <foreach collection="layerCodes" item="item" index="index" separator="," open="(" close=")">