From b55f57bd40c7b2c7108c12fab77e90f51b067df9 Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Wed, 27 Jul 2022 17:51:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=BA=A7=E5=93=81=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=96=B0=E5=A2=9E=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=EF=BC=8C=E6=8C=89=E6=97=B6=E9=97=B4=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/admin/entity/inventory/InvProductEntity.java |  3 +++
 .../glxp/api/admin/thread/InvProductsTrService.java  |  9 ++++++++-
 .../mybatis/mapper/inventory/InvPreInProductDao.xml  |  3 ++-
 .../mybatis/mapper/inventory/InvPreProductDao.xml    |  8 +++++---
 .../mybatis/mapper/inventory/InvProductDao.xml       |  7 +++++--
 scripts/update.sql                                   | 12 ++++++++++++
 6 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InvProductEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InvProductEntity.java
index 22054812..f25b94a4 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InvProductEntity.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InvProductEntity.java
@@ -2,6 +2,8 @@ package com.glxp.api.admin.entity.inventory;
 
 import lombok.Data;
 
+import java.util.Date;
+
 @Data
 public class InvProductEntity {
     private Integer id;
@@ -23,6 +25,7 @@ public class InvProductEntity {
     private String invStorageCode;
     private String invWarehouseCode;
     private String price;
+    private Date updateTime;
 
     public Integer getInCount() {
         if (inCount == null)
diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/InvProductsTrService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/InvProductsTrService.java
index 26dcc9f3..7d19f258 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/thread/InvProductsTrService.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/thread/InvProductsTrService.java
@@ -99,6 +99,7 @@ public class InvProductsTrService {
                                     , warehouseEntity.getLocStorageCode(), warehouseEntity.getInvWarehouseCode());
                     if (invPreProductEntity == null) {
                         invPreProductEntity = buildInvProduct(erpOrderEntity.getGoodsid(), erpOrderEntity, orderEntity, warehouseEntity);
+                        invPreProductEntity.setUpdateTime(new Date());
                         invPreInProductService.insertInvProduct(invPreProductEntity);
                     } else {
                         int actCount = getActCount(warehouseEntity);
@@ -111,6 +112,7 @@ public class InvProductsTrService {
                         if (erpOrderEntity.getPrice() != null) {
                             invPreProductEntity.setPrice(erpOrderEntity.getPrice() + "");
                         }
+                        invPreProductEntity.setUpdateTime(new Date());
                         invPreInProductService.updateInvProduct(invPreProductEntity);
                     }
                 } else if (bussinessTypeEntity.isAdvanceType()) {//预入库，则转存预入库
@@ -119,6 +121,7 @@ public class InvProductsTrService {
                                     , warehouseEntity.getInvStorageCode(), warehouseEntity.getInvWarehouseCode());
                     if (invPreProductEntity == null) {
                         invPreProductEntity = buildInvProduct(erpOrderEntity.getGoodsid(), erpOrderEntity, orderEntity, warehouseEntity);
+                        invPreProductEntity.setUpdateTime(new Date());
                         invPreProductService.insertInvProduct(invPreProductEntity);
                     } else {
                         int actCount = getActCount(warehouseEntity);
@@ -131,6 +134,7 @@ public class InvProductsTrService {
                         if (erpOrderEntity.getPrice() != null) {
                             invPreProductEntity.setPrice(erpOrderEntity.getPrice() + "");
                         }
+                        invPreProductEntity.setUpdateTime(new Date());
                         invPreProductService.updateInvProduct(invPreProductEntity);
                     }
                 } else {        //普通出入库
@@ -139,6 +143,7 @@ public class InvProductsTrService {
                     if (invProductEntity == null) {
                         invProductEntity = buildInvProduct(erpOrderEntity.getGoodsid(), erpOrderEntity, orderEntity, warehouseEntity);
                         invProductEntity.setUnitFk(orderEntity.getFromCorpId());
+                        invProductEntity.setUpdateTime(new Date());
                         invProductService.insertInvProduct(invProductEntity);
                     } else {
                         int actCount = getActCount(warehouseEntity);
@@ -151,6 +156,7 @@ public class InvProductsTrService {
                         if (erpOrderEntity.getPrice() != null) {
                             invProductEntity.setPrice(erpOrderEntity.getPrice() + "");
                         }
+                        invProductEntity.setUpdateTime(new Date());
                         invProductService.updateInvProduct(invProductEntity);
                     }
 
@@ -167,7 +173,7 @@ public class InvProductsTrService {
                                 preInvEntity.setPrice(erpOrderEntity.getPrice() + "");
                             }
                         }
-
+                        preInvEntity.setUpdateTime(new Date());
                         invPreInProductService.updateInvProduct(preInvEntity);
                     }
 
@@ -197,6 +203,7 @@ public class InvProductsTrService {
 
                             if (orderEntity.isPreCheck()) {
 //                                insetInv(bussinessTypeEntity, invProductDetailEntities);//2.插入当前库存
+
                                 invPreInProductDetailService.insertInvProducts(invProductDetailEntities);
                             }
                         }
diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml
index 7204ffcf..248ffc14 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml
@@ -190,7 +190,8 @@
         <if test="groupType != '' and groupType != null">
             GROUP BY #{groupType}
         </if>
-
+        group by inv_prein_product.id
+        order by inv_prein_product.updateTime desc
     </select>
     <insert id="insertInvProduct" keyProperty="id"
             parameterType="com.glxp.api.admin.entity.inventory.InvProductEntity">
diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreProductDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreProductDao.xml
index 8e044a44..3e87028f 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreProductDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreProductDao.xml
@@ -189,20 +189,21 @@
         <if test="groupType != '' and groupType != null">
             GROUP BY #{groupType}
         </if>
-
+        group by inv_pre_product.id
+        order by inv_pre_product.updateTime desc
     </select>
     <insert id="insertInvProduct" keyProperty="id"
             parameterType="com.glxp.api.admin.entity.inventory.InvProductEntity">
         insert INTO inv_pre_product
         (productsName, nameCode, relIdFk, ggxh, batchNo,
          productionDate, expireDate, ylqxzcrbarmc, zczbhhzbapzbh,
-         inCount, outCount, reCount, customerId, supId, unitFk, invStorageCode, invWarehouseCode,price)
+         inCount, outCount, reCount, customerId, supId, unitFk, invStorageCode, invWarehouseCode,price,updateTime)
         values (#{productsName}, #{nameCode},
                 #{relIdFk}, #{ggxh}, #{batchNo},
                 #{productionDate}, #{expireDate},
                 #{ylqxzcrbarmc}, #{zczbhhzbapzbh},
                 #{inCount}, #{outCount}, #{reCount}, #{customerId}, #{supId}, #{unitFk}
-                   , #{invStorageCode}, #{invWarehouseCode},#{price})
+                   , #{invStorageCode}, #{invWarehouseCode},#{price},#{updateTime})
     </insert>
 
 
@@ -233,6 +234,7 @@
             <if test="invStorageCode != null">invStorageCode=#{invStorageCode},</if>
             <if test="invWarehouseCode != null">invWarehouseCode=#{invWarehouseCode},</if>
             <if test="price != null">price=#{price},</if>
+            <if test="updateTime != null">updateTime=#{updateTime},</if>
 
         </trim>
         WHERE id = #{id}
diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml
index 8177ecc4..86466b70 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml
@@ -185,6 +185,7 @@
             GROUP BY #{groupType}
         </if>
         group by inv_product.id
+        order by inv_product.updateTime desc
     </select>
 
     <select id="stockStatistics" resultType="com.glxp.api.admin.res.inventory.InvProductResponse"
@@ -246,13 +247,13 @@
         insert INTO inv_product
         (productsName, nameCode, relIdFk, ggxh, batchNo,
          productionDate, expireDate, ylqxzcrbarmc, zczbhhzbapzbh,
-         inCount, outCount, reCount, customerId, unitFk, supId, invStorageCode, invWarehouseCode,price)
+         inCount, outCount, reCount, customerId, unitFk, supId, invStorageCode, invWarehouseCode,price,updateTime)
         values (#{productsName}, #{nameCode},
                 #{relIdFk}, #{ggxh}, #{batchNo},
                 #{productionDate}, #{expireDate},
                 #{ylqxzcrbarmc}, #{zczbhhzbapzbh},
                 #{inCount}, #{outCount}, #{reCount}, #{customerId}, #{unitFk}, #{supId}
-                   , #{invStorageCode}, #{invWarehouseCode},#{price})
+                   , #{invStorageCode}, #{invWarehouseCode},#{price},#{updateTime})
     </insert>
 
 
@@ -283,6 +284,8 @@
             <if test="invStorageCode != null">invStorageCode=#{invStorageCode},</if>
             <if test="invWarehouseCode != null">invWarehouseCode=#{invWarehouseCode},</if>
             <if test="price != null">price=#{price},</if>
+            <if test="updateTime != null">updateTime=#{updateTime},</if>
+
         </trim>
         WHERE id = #{id}
     </update>
diff --git a/scripts/update.sql b/scripts/update.sql
index 018d38af..763d6962 100644
--- a/scripts/update.sql
+++ b/scripts/update.sql
@@ -54,3 +54,15 @@ alter table `udiwms`.thr_order_upload Add column checkWebNew TINYINT(0) DEFAULT
 alter table `udiwms`.thr_order_upload Add column checkChange TINYINT(0) DEFAULT NULL COMMENT '缺量补单';
 alter table `udiwms`.thr_order_upload Add column checkSp TINYINT(0) DEFAULT NULL COMMENT '自助平台同步';
 alter table `udiwms`.thr_order_upload Add column checkBalacne TINYINT(0) DEFAULT NULL COMMENT '平衡补单';
+
+
+
+alter table `inv_product` Add column updateTime date DEFAULT NULL COMMENT '更新时间';
+alter table `inv_pre_product` Add column updateTime date DEFAULT NULL COMMENT '更新时间';
+alter table `inv_prein_product` Add column updateTime date DEFAULT NULL COMMENT '更新时间';
+
+
+alter  table  inv_product  add  index  orderTime  (updateTime);
+alter  table  inv_pre_product  add  index  orderTime  (updateTime);
+alter  table  inv_pre_product  add  index  orderTime  (updateTime);
+