diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/inventory/InvProductEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/inventory/InvProductEntity.java
index b1a7958..9cc8876 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/entity/inventory/InvProductEntity.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/inventory/InvProductEntity.java
@@ -2,6 +2,8 @@ package com.glxp.sale.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/sale/admin/thread/InvProductsTrService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java
index 5a580a7..ad7cbb3 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java
@@ -103,6 +103,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);
@@ -115,6 +116,7 @@ public class InvProductsTrService {
if (erpOrderEntity.getPrice() != null) {
invPreProductEntity.setPrice(erpOrderEntity.getPrice() + "");
}
+ invPreProductEntity.setUpdateTime(new Date());
invPreInProductService.updateInvProduct(invPreProductEntity);
}
} else if (bussinessTypeEntity.isAdvanceType()) {//预入库,则转存预入库
@@ -123,6 +125,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);
@@ -135,6 +138,7 @@ public class InvProductsTrService {
if (erpOrderEntity.getPrice() != null) {
invPreProductEntity.setPrice(erpOrderEntity.getPrice() + "");
}
+ invPreProductEntity.setUpdateTime(new Date());
invPreProductService.updateInvProduct(invPreProductEntity);
}
} else { //普通出入库
@@ -143,6 +147,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);
@@ -155,6 +160,7 @@ public class InvProductsTrService {
if (erpOrderEntity.getPrice() != null) {
invProductEntity.setPrice(erpOrderEntity.getPrice() + "");
}
+ invProductEntity.setUpdateTime(new Date());
invProductService.updateInvProduct(invProductEntity);
}
@@ -171,6 +177,7 @@ public class InvProductsTrService {
if (erpOrderEntity.getPrice() != null) {
preInvEntity.setPrice(erpOrderEntity.getPrice() + "");
}
+ preInvEntity.setUpdateTime(new Date());
invPreInProductService.updateInvProduct(preInvEntity);
}
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService_back.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService_back.java
index 9534611..133c04f 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService_back.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService_back.java
@@ -124,6 +124,7 @@ public class InvProductsTrService_back {
} else if (orderEntity.getMainAction().equals(ConstantType.TYPE_PUT)) {
invPreProductEntity.setInCount(invPreProductEntity.getInCount() + count);
}
+ invPreProductEntity.setUpdateTime(new Date());
invPreProductService.updateInvProduct(invPreProductEntity);
}
} else { //普通出入库
@@ -156,6 +157,7 @@ public class InvProductsTrService_back {
} else if (orderEntity.getMainAction().equals(ConstantType.TYPE_PUT)) {
invProductEntity.setInCount(invProductEntity.getInCount() + count);
}
+ invProductEntity.setUpdateTime(new Date());
invProductService.updateInvProduct(invProductEntity);
}
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 1116b4d..c09ad20 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml
@@ -196,20 +196,20 @@
GROUP BY #{groupType}
group by inv_prein_product.id
-
+ order by inv_prein_product.updateTime desc
insert INTO inv_prein_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})
@@ -245,6 +245,8 @@
invStorageCode=#{invStorageCode},
price=#{price},
invWarehouseCode=#{invWarehouseCode},
+ updateTime=#{updateTime},
+
WHERE id = #{id}
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 72ec55d..ade6055 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreProductDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreProductDao.xml
@@ -190,20 +190,21 @@
GROUP BY #{groupType}
- group by inv_prein_product.id
+ group by inv_pre_product.id
+ order by inv_pre_product.updateTime desc
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})
@@ -234,6 +235,8 @@
invStorageCode=#{invStorageCode},
invWarehouseCode=#{invWarehouseCode},
price=#{price},
+ updateTime=#{updateTime},
+
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 1efa537..6f142f9 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml
@@ -188,6 +188,7 @@
GROUP BY #{groupType}
group by inv_product.id
+ order by inv_product.updateTime desc