From 74482772cca58f201697c017eb5fb15c59cafb31 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期一, 16 六月 2025 15:26:35 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/WrkDetlLog.java | 7 +++++++
src/main/resources/mapper/asrs/WrkDetlMapper.xml | 1 +
src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java | 2 ++
src/main/java/com/zy/asrs/entity/WrkDetl.java | 7 +++++++
src/main/resources/mapper/asrs/WrkDetlLogMapper.xml | 1 +
src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java | 1 +
src/main/resources/mapper/nc/NccSaleXsfhmxWmsMapper.xml | 2 ++
src/main/java/com/zy/nc/entity/NccSaleXsfhmxWms.java | 10 ++++++++++
src/main/resources/mapper/asrs/OrderMapper.xml | 1 +
src/main/java/com/zy/asrs/entity/Order.java | 10 +++++++++-
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 6 ++++--
11 files changed, 45 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/Order.java b/src/main/java/com/zy/asrs/entity/Order.java
index 3c52da2..e2493ce 100644
--- a/src/main/java/com/zy/asrs/entity/Order.java
+++ b/src/main/java/com/zy/asrs/entity/Order.java
@@ -285,6 +285,13 @@
@TableField("pakin_pakout_status")
private Integer pakinPakoutStatus;
+ /**
+ * 寮�绁ㄥ鎴峰悕绉�
+ */
+ @ApiModelProperty(value = "寮�绁ㄥ鎴峰悕绉�")
+ @TableField("kp_cstmr_name")
+ private String kpCstmrName;
+
public Order() {
}
@@ -325,7 +332,7 @@
this.memo = memo;
}
- public Order(String uuid, String orderNo, String orderTime, Long docType, String itemId, String itemName, String allotItemId, String defNumber, String number, Long cstmr, String cstmrName, String tel, String operMemb, Double totalFee, Double discount, Double discountFee, Double otherFee, Double actFee, Integer payType, String salesman, Integer accountDay, Integer postFeeType, Double postFee, Date payTime, Date sendTime, String shipName, String shipCode, Long settle, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo, Integer pakinPakoutStatus) {
+ public Order(String uuid, String orderNo, String orderTime, Long docType, String itemId, String itemName, String allotItemId, String defNumber, String number, Long cstmr, String cstmrName, String tel, String operMemb, Double totalFee, Double discount, Double discountFee, Double otherFee, Double actFee, Integer payType, String salesman, Integer accountDay, Integer postFeeType, Double postFee, Date payTime, Date sendTime, String shipName, String shipCode, Long settle, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo, Integer pakinPakoutStatus, String kpCstmrName) {
this.uuid = uuid;
this.orderNo = orderNo;
this.orderTime = orderTime;
@@ -361,6 +368,7 @@
this.updateTime = updateTime;
this.memo = memo;
this.pakinPakoutStatus = pakinPakoutStatus;
+ this.kpCstmrName = kpCstmrName;
}
public Order(Order order) {
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index ca41b48..c4a1e08 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -317,6 +317,13 @@
@TableField("stock_num")
private Double stockNum;
+ /**
+ * 寮�绁ㄥ鎴峰悕绉�
+ */
+ @ApiModelProperty(value = "寮�绁ㄥ鎴峰悕绉�")
+ @TableField("kp_cstmr_name")
+ private String kpCstmrName;
+
public String getIoTime$() {
if (Cools.isEmpty(this.ioTime)) {
return "";
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
index a67aecf..a968f03 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
@@ -317,6 +317,13 @@
@TableField("stock_num")
private Double stockNum;
+ /**
+ * 寮�绁ㄥ鎴峰悕绉�
+ */
+ @ApiModelProperty(value = "寮�绁ㄥ鎴峰悕绉�")
+ @TableField("kp_cstmr_name")
+ private String kpCstmrName;
+
public String getIoTime$(){
if (Cools.isEmpty(this.ioTime)){
return "";
diff --git a/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java b/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java
index a98bb6b..250d222 100644
--- a/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java
@@ -35,6 +35,8 @@
private String cstmrName;
+ private String kpCstmrName;
+
// public static void main(String[] args) {
// OpenOrderPakoutParam param = new OpenOrderPakoutParam();
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index efd9eec..bfab5c5 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -106,7 +106,8 @@
9527L, // 淇敼浜哄憳
now, // 淇敼鏃堕棿
null, // 澶囨敞
- 1
+ 1,
+ null
);
if (!orderService.insert(order)) {
@@ -278,7 +279,8 @@
9527L, // 淇敼浜哄憳
now, // 淇敼鏃堕棿
null, // 澶囨敞
- 2
+ 2,
+ param.getKpCstmrName()
);
if (!orderService.insert(order)) {
throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
diff --git a/src/main/java/com/zy/nc/entity/NccSaleXsfhmxWms.java b/src/main/java/com/zy/nc/entity/NccSaleXsfhmxWms.java
index 3df40cb..9ab0cca 100644
--- a/src/main/java/com/zy/nc/entity/NccSaleXsfhmxWms.java
+++ b/src/main/java/com/zy/nc/entity/NccSaleXsfhmxWms.java
@@ -439,6 +439,16 @@
*/
private String fhckmc;
+ /**
+ *
+ */
+ private String kpkhbm;
+
+ /**
+ *
+ */
+ private String kpkhmc;
+
@Override
public boolean equals(Object that) {
if (this == that) {
diff --git a/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java b/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java
index 2dd3437..f9308c4 100644
--- a/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java
+++ b/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java
@@ -102,6 +102,7 @@
nccSaleXsfhmxWms.setWmsFlag(1);
param.setOrderNo(nccSaleXsfhmxWms.getVbillcode() + "-" + size);
param.setCstmrName(nccSaleXsfhmxWms.getKhmc());
+ param.setKpCstmrName(nccSaleXsfhmxWms.getKpkhmc());
}
param.setOrderDetails(orderDetails);
openService.pakoutOrderCreate(param);
diff --git a/src/main/resources/mapper/asrs/OrderMapper.xml b/src/main/resources/mapper/asrs/OrderMapper.xml
index 0e7eee1..44448b8 100644
--- a/src/main/resources/mapper/asrs/OrderMapper.xml
+++ b/src/main/resources/mapper/asrs/OrderMapper.xml
@@ -41,6 +41,7 @@
<result column="memo" property="memo" />
<result column="move_status" property="moveStatus" />
<result column="pakin_pakout_status" property="pakinPakoutStatus" />
+ <result column="kp_cstmr_name" property="kpCstmrName" />
</resultMap>
diff --git a/src/main/resources/mapper/asrs/WrkDetlLogMapper.xml b/src/main/resources/mapper/asrs/WrkDetlLogMapper.xml
index 814c2b6..12c630e 100644
--- a/src/main/resources/mapper/asrs/WrkDetlLogMapper.xml
+++ b/src/main/resources/mapper/asrs/WrkDetlLogMapper.xml
@@ -52,6 +52,7 @@
<result column="box_type2" property="boxType2" />
<result column="box_type3" property="boxType3" />
<result column="stock_num" property="stockNum" />
+ <result column="kp_cstmr_name" property="kpCstmrName" />
</resultMap>
<sql id="batchSeq">
diff --git a/src/main/resources/mapper/asrs/WrkDetlMapper.xml b/src/main/resources/mapper/asrs/WrkDetlMapper.xml
index 3920447..e247490 100644
--- a/src/main/resources/mapper/asrs/WrkDetlMapper.xml
+++ b/src/main/resources/mapper/asrs/WrkDetlMapper.xml
@@ -52,6 +52,7 @@
<result column="box_type2" property="boxType2" />
<result column="box_type3" property="boxType3" />
<result column="stock_num" property="stockNum" />
+ <result column="kp_cstmr_name" property="kpCstmrName" />
</resultMap>
<sql id="batchSeq">
diff --git a/src/main/resources/mapper/nc/NccSaleXsfhmxWmsMapper.xml b/src/main/resources/mapper/nc/NccSaleXsfhmxWmsMapper.xml
index dae8b55..8500126 100644
--- a/src/main/resources/mapper/nc/NccSaleXsfhmxWmsMapper.xml
+++ b/src/main/resources/mapper/nc/NccSaleXsfhmxWmsMapper.xml
@@ -79,6 +79,8 @@
<result property="kczzmc" column="KCZZMC" />
<result property="vnote" column="VNOTE" />
<result property="wmsFlag" column="wms_flag" />
+ <result property="kpkhbm" column="KPKHBM" />
+ <result property="kpkhmc" column="KPKHMC" />
<result property="wmsMemo" column="wms_memo" />
</resultMap>
--
Gitblit v1.9.1