From 49769b13e8bb43a32f3f1f1240d898a31df0aa7e Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Fri, 23 Dec 2022 18:21:43 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E8=AE=BE=E5=A4=87=E9=A2=86?=
 =?UTF-8?q?=E7=94=A8=E5=85=BB=E6=8A=A4=E5=8A=9F=E8=83=BD=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/dao/inventory/DeviceCollectOrderDetailDao.java  | 7 +++++++
 .../api/admin/req/inventory/AddDeviceMAOrderRequest.java  | 5 +++++
 .../inventory/impl/DeviceCollectOrderServiceImpl.java     | 6 ++++++
 .../service/inventory/impl/DeviceMAOrderServiceImpl.java  | 1 +
 .../mybatis/mapper/inventory/DeviceCollectOrderDao.xml    | 1 +
 .../mapper/inventory/DeviceCollectOrderDetailDao.xml      | 8 ++++++++
 .../mybatis/mapper/inventory/DeviceMAOrderDetailDao.xml   | 3 ++-
 7 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceCollectOrderDetailDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceCollectOrderDetailDao.java
index a3494ccd..0a31f713 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceCollectOrderDetailDao.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/DeviceCollectOrderDetailDao.java
@@ -69,4 +69,11 @@ public interface DeviceCollectOrderDetailDao {
      * @param details
      */
     void updateCodeBatch(List<DeviceCollectOrderDetailEntity> details);
+
+    /**
+     * 重置code字段和序列号字段值
+     *
+     * @param orderId
+     */
+    void resetCode(@Param("orderId") String orderId);
 }
\ No newline at end of file
diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/AddDeviceMAOrderRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/AddDeviceMAOrderRequest.java
index 6ad348e7..e6405550 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/AddDeviceMAOrderRequest.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/AddDeviceMAOrderRequest.java
@@ -42,4 +42,9 @@ public class AddDeviceMAOrderRequest {
      * 备注
      */
     private String remark;
+
+    /**
+     * 设备领用记录ID
+     */
+    private String collOrderId;
 }
diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceCollectOrderServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceCollectOrderServiceImpl.java
index 36b50e61..c5cb9a12 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceCollectOrderServiceImpl.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceCollectOrderServiceImpl.java
@@ -134,6 +134,12 @@ public class DeviceCollectOrderServiceImpl implements DeviceCollectOrderService
         String auditUser = customerService.getUserBean().getUserName();
         deviceCollectOrderEntity.setAuditUser(auditUser);
         deviceCollectOrderEntity.setStatus(status);
+
+        //驳回领用记录，置空无序列号数据的序列号和code字段值
+        if (status == 0) {
+            deviceCollectOrderDetailDao.resetCode(deviceCollectOrderEntity.getOrderId());
+        }
+
         deviceCollectOrderDao.updateByPrimaryKey(deviceCollectOrderEntity);
         return ResultVOUtils.success("更新成功！");
     }
diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceMAOrderServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceMAOrderServiceImpl.java
index 89bf388f..3d5500f9 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceMAOrderServiceImpl.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/DeviceMAOrderServiceImpl.java
@@ -140,6 +140,7 @@ public class DeviceMAOrderServiceImpl implements DeviceMAOrderService {
         deviceMAOrderEntity.setCreateTime(addDeviceMAOrderRequest.getCreateTime());
         deviceMAOrderEntity.setUpdateTime(DateUtil.getDateTime());
         deviceMAOrderEntity.setStatus(1);
+        deviceMAOrderEntity.setCollOrderId(addDeviceMAOrderRequest.getCollOrderId());
 
         //查询领用详情表中此条码的数据
         DeviceCollectOrderDetailEntity deviceCollectOrderDetail = deviceCollectOrderDetailDao.findOneByCode(addDeviceMAOrderRequest.getCode());
diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceCollectOrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceCollectOrderDao.xml
index 1e34dfdc..c3306ef6 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceCollectOrderDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceCollectOrderDao.xml
@@ -174,6 +174,7 @@
                 AND dco.deptCode = #{deptCode}
             </if>
         </where>
+        order by dco.updateTime desc
     </select>
 
     <select id="selectOrderIdById" resultType="java.lang.String">
diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceCollectOrderDetailDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceCollectOrderDetailDao.xml
index 51e4bf47..5f895750 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceCollectOrderDetailDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceCollectOrderDetailDao.xml
@@ -407,4 +407,12 @@
             where id = #{item.id}
         </foreach>
     </update>
+
+    <update id="resetCode">
+        update device_collect_order_detail
+        set code     = null,
+            serialNo = null
+        where orderIdFk = #{orderId}
+          and code like '%#'
+    </update>
 </mapper>
\ No newline at end of file
diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceMAOrderDetailDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceMAOrderDetailDao.xml
index 233b10ed..ccbf5e6a 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceMAOrderDetailDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceMAOrderDetailDao.xml
@@ -278,6 +278,7 @@
         from inv_product ip
         left join basic_udirel bu on bu.id = ip.relIdFk
         left join basic_products bp on bu.uuid = bp.uuid
-        where bu.id = #{productId}
+        where ip.relIdFk = #{productId}
+        group by ip.relIdFk
     </select>
 </mapper>
\ No newline at end of file