From 53ba3af68728efd4e3a5e8494e1ee665bb5a7e47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com>
Date: Tue, 26 Nov 2024 15:48:04 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8D=95=20=E6=96=B0=E5=A2=9E=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AE=E5=85=A5=E5=BA=93=E5=8D=95=E5=8F=B7=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8D=95mapper=E6=96=B9=E6=B3=95=EF=BC=9B=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=9F=E4=BA=A7=E5=85=A5=E5=BA=93=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E5=93=81=E8=B4=A8=E5=8D=95service=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E4=BA=A4=E6=A3=80=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E8=B5=8B=E5=80=BC=E8=AF=AD=E5=8F=A5=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/system/service/impl/SysMakeOrderServiceImpl.java   | 2 ++
 .../ruoyi/warehouse/mapper/WarehouseStorageOrderMapper.java  | 4 ++++
 .../mapper/warehouse/WarehouseStorageOrderMapper.xml         | 5 +++++
 3 files changed, 11 insertions(+)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeOrderServiceImpl.java
index 9d702027..fe761dec 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeOrderServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeOrderServiceImpl.java
@@ -687,6 +687,7 @@ public class SysMakeOrderServiceImpl implements ISysMakeOrderService
         qualityOrderDetail.setQualityStorageStatus("4");
         qualityOrderDetail.setQualityOrderType("1");
         qualityOrderDetail.setRelatedOrderCode(makeorderBom.getMakeNo());
+        qualityOrderDetail.setDeliveryInspectionTime(DateUtils.getNowDate());
         qualityOrderDetail.setCreateBy(ShiroUtils.getLoginName());
         qualityOrderDetail.setCreateTime(DateUtils.getNowDate());
         return orderDetailMapper.insertQualityOrderDetail(qualityOrderDetail);
@@ -699,6 +700,7 @@ public class SysMakeOrderServiceImpl implements ISysMakeOrderService
         qualityOrder.setQualityStatus("0");
         qualityOrder.setQualityStorageStatus("4");
         qualityOrder.setQualityOrderType("1");
+        qualityOrder.setDeliveryInspectionTime(DateUtils.getNowDate());
         qualityOrder.setCreateTime(DateUtils.getNowDate());
         qualityOrder.setCreateBy(loginName);
         return qualityOrder;
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseStorageOrderMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseStorageOrderMapper.java
index 16e7abcb..df1657c7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseStorageOrderMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseStorageOrderMapper.java
@@ -21,6 +21,10 @@ public interface WarehouseStorageOrderMapper
      */
     public WarehouseStorageOrder selectWarehouseStorageOrderById(Long warehouseStorageId);
 
+    /*
+    * 根据入库单号查询入库单*/
+    public WarehouseStorageOrder selectWarehouseStorageOrderByCode(String warehouseStorageCode);
+
     /**
      * 查询仓库入库单列表
      * 
diff --git a/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseStorageOrderMapper.xml b/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseStorageOrderMapper.xml
index 2896e5d3..0f709516 100644
--- a/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseStorageOrderMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseStorageOrderMapper.xml
@@ -75,6 +75,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectWarehouseStorageOrderVo"/>
         where warehouse_storage_id = #{warehouseStorageId}
     </select>
+
+    <select id="selectWarehouseStorageOrderByCode" parameterType="String" resultMap="WarehouseStorageOrderResult">
+        <include refid="selectWarehouseStorageOrderVo"/>
+        where warehouse_storage_code = #{warehouseStorageCode}
+    </select>
         
     <insert id="insertWarehouseStorageOrder" parameterType="WarehouseStorageOrder" useGeneratedKeys="true" keyProperty="warehouseStorageId">
         insert into warehouse_storage_order