From d4c3ebd99e8619c3fc230bb50828e9e762f8dd7a Mon Sep 17 00:00:00 2001
From: zwl <zwl123456>
Date: 星期二, 30 九月 2025 09:23:25 +0800
Subject: [PATCH] 字段完善
---
src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java | 12 +++++++-----
src/main/java/com/zy/asrs/entity/result/OrderRsult.java | 1 +
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 2 ++
src/main/resources/application.yml | 4 +++-
4 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/result/OrderRsult.java b/src/main/java/com/zy/asrs/entity/result/OrderRsult.java
index 02a36f5..7dde655 100644
--- a/src/main/java/com/zy/asrs/entity/result/OrderRsult.java
+++ b/src/main/java/com/zy/asrs/entity/result/OrderRsult.java
@@ -47,5 +47,6 @@
public String coutposcode;
public String itrsid;
public String editprop;
+ public String cFree1;
}
}
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 e248bab..9ed5e0b 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -121,6 +121,7 @@
OrderDetl orderDetl = new OrderDetl();
orderDetl.sync(mat);
orderDetl.setBatch(detlDto.getBatch());
+ orderDetl.setModel(detlDto.getModel());
orderDetl.setAnfme(detlDto.getAnfme());
orderDetl.setOrderId(order.getId());
orderDetl.setOrderNo(order.getOrderNo());
@@ -259,6 +260,7 @@
OrderDetl orderDetl = new OrderDetl();
orderDetl.sync(mat);
orderDetl.setBatch(detlDto.getBatch());
+ orderDetl.setModel(detlDto.getModel());
orderDetl.setAnfme(detlDto.getAnfme());
orderDetl.setOrderId(order.getId());
orderDetl.setOrderNo(order.getOrderNo());
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
index 54dc6bd..074469f 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
@@ -173,8 +173,8 @@
headTable.setCmaker("sys");//鍒跺崟浜哄悕绉�
headTable.setVt_id("89");//妯℃澘鍙� 榛樿
- headTable.setCiwhcode("1");//杞叆浠撳簱缂栫爜
- headTable.setCowhcode("1");//杞嚭浠撳簱缂栫爜
+ headTable.setCiwhcode(order.getShipName());//杞叆浠撳簱缂栫爜
+ headTable.setCowhcode(order.getShipCode());//杞嚭浠撳簱缂栫爜
headTable.setCordcode("");//鍑哄簱绫诲埆缂栫爜 榛樿
headTable.setCirdcode("");//鍏ュ簱绫诲埆缂栫爜 榛樿
headTable.setCodepcode("");//杞嚭閮ㄩ棬缂栫爜
@@ -187,10 +187,12 @@
bodyTable.setCtvbatch(Cools.isEmpty(orderDetl.getBatch()) ? "" : orderDetl.getBatch());//鎵瑰彿锛堢壒娈婅鏄庯級
Double qty = orderDetl.getQty()-(Cools.isEmpty(orderDetl.getUnits())?0:orderDetl.getUnits());
bodyTable.setItvquantity(String.valueOf(qty));//瀹屾垚浠舵暟
- bodyTable.setCinposcode("1-1");//绔嬪簱婧愯揣浣�
+// bodyTable.setCinposcode("1-1");//绔嬪簱婧愯揣浣�
bodyTable.setCoutposcode("");//鐩爣璐т綅
bodyTable.setItrsid(orderDetl.getMemo());//琛屼富閿�
- bodyTable.setEditprop(sts.equals(1) ? "A" : "B");//鐘舵�� A 鏂板
+ bodyTable.setCFree1("鏃�");
+
+// bodyTable.setEditprop(sts.equals(1) ? "A" : "B");//鐘舵�� A 鏂板
User user = userService.selectById(orderDetl.getUpdateBy());
headTable.setWms_operator(user == null ? "" : user.getUsername()); // 鎿嶄綔璐﹀彿鍚嶇О
@@ -222,7 +224,7 @@
if (jsonObject.getInteger("code").equals(1)) {
orderDetl.setUnits(qty+orderDetl.getUnits());
- orderDetl.setStatus(sts);
+ orderDetl.setStatus(0);
orderDetlService.updateById(orderDetl);
success = true;
// 涓�鏉¤鍗曟槑缁嗗畬鎴愶紝涓婃姤鍏抽棴
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 5a5981f..5f26915 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,7 @@
server:
- port: 8081
+ port: 8080
+ #娴嬭瘯鐜绔彛
+# port: 8888
servlet:
context-path: /@pom.build.finalName@
--
Gitblit v1.9.1