From 8375447cc43cf80c990fb0bb1669084d24a91d04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Thu, 24 Aug 2023 11:31:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E9=A2=86=E7=94=A8=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glxp/api/controller/basic/UdiRelevanceController.java    | 1 +
 .../inv/impl/DeviceReceiveOrderDetailServiceImpl.java        | 1 +
 .../api/service/inv/impl/DeviceReceiveOrderServiceImpl.java  | 3 +++
 src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml  | 5 +++++
 4 files changed, 10 insertions(+)

diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java
index 784cccbe1..6ee2e9463 100644
--- a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java
+++ b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java
@@ -251,6 +251,7 @@ public class UdiRelevanceController extends BaseController {
     @PostMapping("/udiwms/udiinfo/selectProduct")
     public BaseResponse selectProduct(@RequestBody  FilterUdiRelRequest filterUdiRelRequest) {
         List<UdiRelevanceResponse> udiRelevanceResponses = null;
+        filterUdiRelRequest.setKey("1");
         udiRelevanceResponses = udiRelevanceService.filterUdiRelevance(filterUdiRelRequest);
         PageInfo<UdiRelevanceResponse> pageInfo;
         pageInfo = new PageInfo<>(udiRelevanceResponses);
diff --git a/src/main/java/com/glxp/api/service/inv/impl/DeviceReceiveOrderDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/DeviceReceiveOrderDetailServiceImpl.java
index 61de81435..326068827 100644
--- a/src/main/java/com/glxp/api/service/inv/impl/DeviceReceiveOrderDetailServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/inv/impl/DeviceReceiveOrderDetailServiceImpl.java
@@ -122,6 +122,7 @@ public class DeviceReceiveOrderDetailServiceImpl implements DeviceReceiveOrderDe
 
                     UdiRelevanceResponse udiRelevanceResponse = udiProductService.filterUdiInfoById(invProductId);
                     //查询库存详情
+                    deviceReceiveOrderDetailEntity.setNameCode(udiRelevanceResponse.getNameCode());
                     deviceReceiveOrderDetailEntity.setRelId(udiRelevanceResponse.getRelId());
                     deviceReceiveOrderDetailEntity.setOrderIdFk(addDetailRequest.getOrderIdFk());
                     deviceReceiveOrderDetailEntity.setSupId(udiRelevanceResponse.getUnitFk());
diff --git a/src/main/java/com/glxp/api/service/inv/impl/DeviceReceiveOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/DeviceReceiveOrderServiceImpl.java
index 61c46d6a7..47b399178 100644
--- a/src/main/java/com/glxp/api/service/inv/impl/DeviceReceiveOrderServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/inv/impl/DeviceReceiveOrderServiceImpl.java
@@ -14,6 +14,7 @@ import com.glxp.api.constant.Constant;
 import com.glxp.api.constant.FileConstant;
 import com.glxp.api.dao.inv.DeviceReceiveOrderDao;
 import com.glxp.api.dao.inv.DeviceReceiveOrderDetailDao;
+import com.glxp.api.entity.auth.AuthAdmin;
 import com.glxp.api.entity.inv.DeviceReceiveOrderDetailEntity;
 import com.glxp.api.entity.inv.DeviceReceiveOrderEntity;
 import com.glxp.api.entity.purchase.SupCertEntity;
@@ -81,11 +82,13 @@ public class DeviceReceiveOrderServiceImpl implements DeviceReceiveOrderService
         if (null == deviceReceiveOrderEntity) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
         }
+        AuthAdmin authAdmin =customerService.getUserBean();
         //生成单号
         String orderId = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.DEVICE_RECEIVE_ORDER, "yyyyMMdd"));
         deviceReceiveOrderEntity.setOrderId(orderId);
         deviceReceiveOrderEntity.setStatus(0);
         Date date = new Date();
+        deviceReceiveOrderEntity.setReceiveUser(authAdmin.getId() + "");
         deviceReceiveOrderEntity.setCreateTime(date);
         deviceReceiveOrderEntity.setUpdateTime(date);
         String userName = customerService.getUserBean().getUserName();
diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
index 8b468f761..38c75c8b5 100644
--- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
@@ -124,6 +124,11 @@
                 AND nameCode = #{uniqueNameCode}
             </if>
         </where>
+        <choose>
+            <when test="key !=null and key != '' ">
+                GROUP BY basic_udirel.id
+            </when>
+        </choose>
         ORDER BY modifyTime DESC
     </select>
     <select id="selectPackLevel" parameterType="java.lang.String"