From cb1f6d4df311494908b6ca50ac9a7e1fbfd5861f Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 04 七月 2024 15:53:09 +0800
Subject: [PATCH] Merge branch 'tzhneasrs' of http://47.97.1.152:5880/r/zy-asrs into tzhneasrs
---
src/main/webapp/views/pla/sellout.html | 2 +-
src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java | 2 +-
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 4 ++--
src/main/resources/application.yml | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
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 87809c6..39b3894 100644
--- a/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java
@@ -49,7 +49,7 @@
}
public void setdDate(String dDate) throws ParseException {
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/DD hh:mm:ss");
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-DD hh:mm:ss");
this.dDate = sdf.parse(dDate);
}
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 acae7ef..7e36963 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -587,8 +587,8 @@
OpenOrderPakoutParam param = new OpenOrderPakoutParam();
String type = Cools.isEmpty(pla.getProOrderNo()) ? "璋冩嫧鍏ュ簱鍗�" : "鐢熶骇鍏ュ簱鍗�";
param.setcCode(pla.getProOrderNo());
- param.setcAccount(pla.getOwner());
- param.setdDate(Utils.getDateStr1(new Date()));
+ param.setcAccount(pla.getWorkshop());
+ param.setdDate(Utils.getDateStr(new Date()));
param.setType(type);
List<OpenOrderPakoutParam.Body> bodyList = new ArrayList<>();
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 763c980..ab99946 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -60,5 +60,5 @@
enable: false
u8:
- url: localhost:8080
- path: /test/report
+ url: 122.225.245.106:10076
+ path: /api/Yp/U8API
diff --git a/src/main/webapp/views/pla/sellout.html b/src/main/webapp/views/pla/sellout.html
index 14fdf90..64aed60 100644
--- a/src/main/webapp/views/pla/sellout.html
+++ b/src/main/webapp/views/pla/sellout.html
@@ -246,7 +246,7 @@
checkData[i].customer = $('#customer').val();
checkData[i].phone = $('#phone').val();
checkData[i].addr = $('#addr').val();
- checkData[i].orderWeight = detailData[i] ? detailData[i].weight : checkData[i].weightAnfme;
+ checkData[i].orderWeight = detailData[i] ? detailData[i].weight : checkData[i].weightAnfme - checkData[i].qtyAnfme;
checkData[i].allocate = $('#allocate').val();
checkData[i].memo = $('#memo').val();
checkData[i].pakoutTime = $('#pakoutTime').val();
--
Gitblit v1.9.1