From fd26536a3ce4c870f11595ffd59aad3c90ae2e7f Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Wed, 11 Jan 2023 15:02:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../admin/controller/inout/OrderDetailController.java | 5 +++++
.../com/glxp/api/admin/entity/thrsys/ThrOrderEntity.java | 9 ++++-----
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java
index 498bb8e4..2838d2d9 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java
@@ -139,6 +139,11 @@ public class OrderDetailController {
for (ThrOrderEntity thrOrderEntity : data) {
FilterThrOrderDetailRequest filterThrOrderDetailRequest = new FilterThrOrderDetailRequest();
filterThrOrderDetailRequest.setOrderIdFk(thrOrderEntity.getId() + "");
+ //修改数据库数据
+ ThrOrderDetailEntity thrOrderDetailEntity1 = new ThrOrderDetailEntity();
+ thrOrderDetailEntity1.setOrderIdFk(thrOrderEntity.getId() + "");
+ thrOrderDetailEntity1.setId(thrOrderEntity.getId());
+ thrOrderDetailService.updateThrOrderDetail(thrOrderDetailEntity1);
List<ThrOrderDetailEntity> thrOrderDetailEntities =
thrOrderDetailService.filterThrOrderDetailDetail(filterThrOrderDetailRequest);
ErpOrderResponse erpOrderResponse = new ErpOrderResponse();
diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrOrderEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrOrderEntity.java
index bad726a2..32de14b1 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrOrderEntity.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrOrderEntity.java
@@ -18,8 +18,9 @@ public class ThrOrderEntity {
private String billFlag;
private String thirdSysFk;
private Date updateTime;
- private Date thirdPartyDate;
private String originType;
+ private String unitIdFk;
+ private int type;
//增加字段
private String startDate; //起始日期
@@ -34,14 +35,12 @@ public class ThrOrderEntity {
private String remark2; //备注2
private String remark3; //备注3
- private int type;
-
private String locStorageCode;
- private Integer editStatus;
private String invWarehouseCode;
private String invWarehouseName;
private String fromSubInvName;
- private String unitIdFk;
+ private int editStatus;
+ private int thirdPartyDate;
private int allocateStatus; //1:已配货；0：未配货
}