From 0aaf1e9de82880deca39da741a8ef124fb7a37b5 Mon Sep 17 00:00:00 2001
From: zhenggl <zhenggl@digiwin.com>
Date: Mon, 18 Sep 2023 16:37:57 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E8=A7=84=E6=A0=BC?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E9=95=BF=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/sql/app-20230912-ddl.sql | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/sql/app-20230912-ddl.sql b/doc/sql/app-20230912-ddl.sql
index 55ec73e..9ae7f32 100644
--- a/doc/sql/app-20230912-ddl.sql
+++ b/doc/sql/app-20230912-ddl.sql
@@ -139,3 +139,7 @@ ALTER TABLE `cim_collection_detail` MODIFY COLUMN `sku_spec` varchar (255);
 --添加消费额度字段
 alter table cim_collection_detail Add column quota_details varchar(32) null default '' COMMENT '消费额度';
 alter table cim_receivables_detail Add column quota_details varchar(32) null default '' COMMENT '消费额度';
+
+
+--规格字段修改
+ALTER TABLE `cim_production_details` MODIFY COLUMN `sku_spec` varchar (255);

From fe3bf998661b970fb2abedcab99188e8ead3316e Mon Sep 17 00:00:00 2001
From: zhenggl <zhenggl@digiwin.com>
Date: Tue, 19 Sep 2023 10:53:58 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=E5=86=BB=E7=BB=93=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E8=A1=A8=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../infra/entity/ProductionDetailsEntity.java   | 17 +++++++++++++++++
 .../production/ProductionCreateEAIService.java  |  1 +
 .../ReceivablesInitialCreateEAIService.java     |  4 ++--
 doc/sql/app-20230912-ddl.sql                    |  6 ++++++
 4 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/ptc/infra/entity/ProductionDetailsEntity.java b/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/ptc/infra/entity/ProductionDetailsEntity.java
index f180177..cd64455 100644
--- a/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/ptc/infra/entity/ProductionDetailsEntity.java
+++ b/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/ptc/infra/entity/ProductionDetailsEntity.java
@@ -94,6 +94,23 @@ public class ProductionDetailsEntity extends BaseMgrEntity<ProductionDetailsEnti
     @SerializedName(value = "overdue_days")
     private String overdueDays;
 
+    /** 额度占用百分比 */
+    @SerializedName(value = "quota_details")
+    private String quotaDetails;
+
+    /** 冻结原因 */
+    @SerializedName(value = "freeze_reason")
+    private String freezeReason;
+
+    /** 客户名称 */
+    @SerializedName(value = "customer_name")
+    private String customerName;
+
+    /** 客户编号 */
+    @SerializedName(value = "customer_no")
+    private String customerNo;
+
+
     public ProductionDetailsEntity(String factoryNo, String factoryName, String productionManagementPerson) {
         this.factoryNo = factoryNo;
         this.factoryName = factoryName;
diff --git a/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/ptc/service/production/ProductionCreateEAIService.java b/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/ptc/service/production/ProductionCreateEAIService.java
index c59e9e8..1c62239 100644
--- a/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/ptc/service/production/ProductionCreateEAIService.java
+++ b/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/ptc/service/production/ProductionCreateEAIService.java
@@ -76,6 +76,7 @@ public class ProductionCreateEAIService extends AbsEAIService {
             productionDetailsEntity.setNature(String.valueOf(nature));
             productionDetailsEntity.setBatchNo("MMDD-000"+batchNo);
             productionDetailsEntity.setUnit("pcs");
+            productionDetailsEntity.setFreezeReason("剩余信用额度比例不足");
             batchNo = batchNo+1;
             //预计产量赋值
             if (CollectionUtils.isNotEmpty(receivablesDetailEntities)) {
diff --git a/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/ptc/service/receivables/ReceivablesInitialCreateEAIService.java b/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/ptc/service/receivables/ReceivablesInitialCreateEAIService.java
index fc202f2..b2fdc4e 100644
--- a/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/ptc/service/receivables/ReceivablesInitialCreateEAIService.java
+++ b/demo-athenaopt_backend/develop/src/main/java/com/digiwin/athena/app/ptc/service/receivables/ReceivablesInitialCreateEAIService.java
@@ -141,8 +141,8 @@ public class ReceivablesInitialCreateEAIService extends AbsEAIService {
             receivablesDetailEntity.setSalesOrder("SO-"+SnowflakeWorker.nextId());
             receivablesDetailEntity.setSalesOrderNumber("SON-000"+no);
             receivablesDetailEntity.setSalesmanAssistant("Sp0001");
-            receivablesDetailEntity.setSalesmanBoss("qcuser004");
-            receivablesDetailEntity.setSalesman("Sp0001");
+            receivablesDetailEntity.setSalesmanBoss("qcsupplier001");
+            receivablesDetailEntity.setSalesman("qcuser001");
             receivablesDetailEntity.setProduceBoss("Sp0002");
             receivablesDetailEntity.setEmail("ath_Sp0001@163.com");
             receivablesDetailEntity.setWorkNo("work-"+SnowflakeWorker.nextId());
diff --git a/doc/sql/app-20230912-ddl.sql b/doc/sql/app-20230912-ddl.sql
index 9ae7f32..1a7f79a 100644
--- a/doc/sql/app-20230912-ddl.sql
+++ b/doc/sql/app-20230912-ddl.sql
@@ -143,3 +143,9 @@ alter table cim_receivables_detail Add column quota_details varchar(32) null def
 
 --规格字段修改
 ALTER TABLE `cim_production_details` MODIFY COLUMN `sku_spec` varchar (255);
+
+--生产表新增字段
+alter table cim_production_details Add column quota_details varchar(50) null default '' COMMENT '额度占用百分比',
+Add column freeze_reason varchar(255) null default '' COMMENT '冻结原因',
+Add column customer_name varchar(255) null default '' COMMENT '客户名称',
+Add column customer_no varchar(255) null default '' COMMENT '客户编号';