From 1baeb88125f264fa1949a17a83a2c83182f79499 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期一, 30 五月 2022 13:01:07 +0800
Subject: [PATCH] #
---
src/main/webapp/views/salesOrder/salesOrder.html | 25 ++++++++
src/main/webapp/static/js/salesOrder/salsesOrder.js | 63 ++++++++++++++++----
src/main/java/com/zy/common/web/WcsController.java | 88 +++++++++++++++++++++++++++--
src/main/resources/application.yml | 2
4 files changed, 157 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index dd60ed2..b8a039c 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -43,11 +43,22 @@
JSONObject jsonObject1 = new JSONObject();
JSONArray jsonArray = new JSONArray();
for (InterData interData : list) {
- //鏌ヨ瀵瑰簲鍏ュ簱閫氱煡妗ｄ俊鎭�
- Wrapper wrapper = new EntityWrapper<WaitPakin>().eq("supplier", interData.getFBillNo()).eq("matnr", interData.getFnumber());
- WaitPakin waitPakin = waitPakinService.selectOne(wrapper);
- if ((interData.getIoType() == 1 && interData.getMatType() == 1) || (interData.getIoType() == 2 && interData.getMatType() == 2)) {
+ //鍘熸潗鏂欏叆搴�
+ if ((interData.getIoType() == 1 && interData.getMatType() == 1)) {
+ //鏌ヨ瀵瑰簲鍏ュ簱閫氱煡妗ｄ俊鎭�
+ Wrapper wrapper = new EntityWrapper<WaitPakin>().eq("supplier", interData.getFBillNo()).eq("matnr", interData.getFnumber());
+ WaitPakin waitPakin = waitPakinService.selectOne(wrapper);
+ if(Cools.isEmpty(waitPakin)){
+ JSONObject object = new JSONObject();
+ object.put("FInterID", interData.getFInterID());
+ object.put("Fnumber", interData.getFnumber());
+ object.put("code", 500);
+ object.put("msg", "鍗曟嵁涓嶅瓨鍦ㄦ垨鍗曟嵁宸茶鍒犻櫎");
+ jsonArray.add(object);
+ continue;
+ }
+
if (Cools.isEmpty(waitPakin)) {
JSONObject object = new JSONObject();
object.put("FInterID", interData.getFInterID());
@@ -57,8 +68,10 @@
jsonArray.add(object);
continue;
}
- //鍒ゆ柇鏄惁鏈夊嚭搴撳姩浣� "N"娌℃湁 鈥淵鈥濇湁
- if (waitPakin.getIoStatus().equals("N")) {
+
+ //鍒ゆ柇鏄惁鏈夊叆搴撳姩浣� "N"娌℃湁 鈥淵鈥濇湁
+// interData.getFQty().compareTo(waitPakin.getAnfme())
+ if (waitPakin.getIoStatus().equals("N") && waitPakin.getAnfme() < interData.getFQty().doubleValue() ) {
//鍒ゆ柇浼犲叆鐨勬暟閲忔槸鍚︿负0鏉ユ墽琛屽垹闄ゆ垨鑰呬慨鏀�
if (interData.getFQty().compareTo(BigDecimal.ZERO) == 0) {
waitPakinService.delete(wrapper);
@@ -89,6 +102,68 @@
}
}
+ //鎴愬搧鍏ュ韩
+ if (interData.getIoType() == 2 && interData.getMatType() == 2) {
+ //鏌ヨ瀵瑰簲鍏ュ簱閫氱煡妗ｄ俊鎭�
+ Wrapper wrapper = new EntityWrapper<WaitPakin>().eq("supplier", interData.getFBillNo()).eq("matnr", interData.getFnumber());
+ WaitPakin waitPakin = waitPakinService.selectOne(wrapper);
+ if(Cools.isEmpty(waitPakin)){
+ JSONObject object = new JSONObject();
+ object.put("FInterID", interData.getFInterID());
+ object.put("Fnumber", interData.getFnumber());
+ object.put("code", 500);
+ object.put("msg", "鍗曟嵁涓嶅瓨鍦ㄦ垨鍗曟嵁宸茶鍒犻櫎");
+ jsonArray.add(object);
+ continue;
+ }
+
+ if (Cools.isEmpty(waitPakin)) {
+ JSONObject object = new JSONObject();
+ object.put("FInterID", interData.getFInterID());
+ object.put("Fnumber", interData.getFnumber());
+ object.put("code", 500);
+ object.put("msg", "鍗曟嵁涓嶅瓨鍦ㄦ垨鍗曟嵁宸茶鍒犻櫎");
+ jsonArray.add(object);
+ continue;
+ }
+
+ WaitPakin one = waitPakinService.selectOne(new EntityWrapper<WaitPakin>()
+ .eq("supplier", interData.getFBillNo())
+ .eq("matnr", interData.getFnumber())
+ .isNotNull("zpallet"));
+ //鍒ゆ柇鏄惁鏈夊叆搴撳姩浣� "N"娌℃湁 鈥淵鈥濇湁
+ if (waitPakin.getIoStatus().equals("N") && Cools.isEmpty(one)) {
+ //鍒ゆ柇浼犲叆鐨勬暟閲忔槸鍚︿负0鏉ユ墽琛屽垹闄ゆ垨鑰呬慨鏀�
+ if (interData.getFQty().compareTo(BigDecimal.ZERO) == 0) {
+ waitPakinService.delete(wrapper);
+ JSONObject object = new JSONObject();
+ object.put("Fnumber", interData.getFnumber());
+ object.put("FInterID", interData.getFInterID());
+ object.put("code", 200);
+ object.put("msg", "鍒犻櫎鎴愬姛");
+ jsonArray.add(object);
+ } else {
+ waitPakin.setAnfme(interData.getFQty().doubleValue());
+ waitPakinService.update(waitPakin, wrapper);
+ JSONObject object = new JSONObject();
+ object.put("Fnumber", interData.getFnumber());
+ object.put("FInterID", interData.getFInterID());
+ object.put("code", 200);
+ object.put("msg", "淇敼鎴愬姛");
+ jsonArray.add(object);
+ }
+
+ } else {
+ JSONObject object = new JSONObject();
+ object.put("FInterID", interData.getFInterID());
+ object.put("Fnumber", interData.getFnumber());
+ object.put("code", 500);
+ object.put("msg", "宸插湪鍏ュ簱涓紝鏃犳硶鍙栨秷");
+ jsonArray.add(object);
+ }
+ }
+
+ //鎴愬搧鍑哄韩
if (interData.getIoType() == 3) {
Wrapper wrapper1 = new EntityWrapper<OutStockBillEntry>().eq("FInterID", interData.getFInterID()).and().eq("Fnumber", interData.getFnumber());
OutStockBillEntry outStockBillEntry = outStockService.selectOne(wrapper1);
@@ -114,6 +189,7 @@
jsonArray.add(object);
} else {
outStockBillEntry.setFAuxQty(interData.getFQty());
+ outStockBillEntry.setFQty(interData.getFQty());
outStockService.update(outStockBillEntry, wrapper1);
JSONObject object = new JSONObject();
object.put("Fnumber", interData.getFnumber());
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 2b912a0..a37abf2 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -45,7 +45,7 @@
erp:
db:
driver_class_name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- ur: jdbc:sqlserver://localhost:1433;databasename=xtyasrs_dual
+ ur: jdbc:sqlserver://192.168.4.23:1433;databasename=xtyasrs_dual
# ur: jdbc:sqlserver://192.168.4.208:1433;databasename=xtyasrs_dual
username: sa
password: sa@123
diff --git a/src/main/webapp/static/js/salesOrder/salsesOrder.js b/src/main/webapp/static/js/salesOrder/salsesOrder.js
index bdc5f19..2508d00 100644
--- a/src/main/webapp/static/js/salesOrder/salsesOrder.js
+++ b/src/main/webapp/static/js/salesOrder/salsesOrder.js
@@ -17,7 +17,10 @@
, {field: 'inQty', align: 'center', title: '鍏ュ簱鏁伴噺', width: 110}
, {field: 'disQty', align: 'center', title: '閫氱煡鍗�', width: 110}
, {field: 'outQty', align: 'center', title: '鍑哄簱鏁伴噺', width: 110}
-
+ , {field: 'invoiceQty', align: 'center', title: '寮�绁ㄦ暟閲�'}
+ , {field: 'unInvoiceQty', align: 'center', title: '鏈紑绁ㄦ暟閲�'}
+ , {field: 'deliveryDate', align: 'center', title: '浜よ揣鏃ユ湡'}
+ , {field: 'personName', align: 'center', title: '涓氬姟鍛�'}
);
return cols;
}
@@ -94,18 +97,13 @@
/* 琛ㄦ牸鏁版嵁閲嶈浇 */
function tableReload(child) {
var searchData = {};
- $.each($('#search-box [name]').serializeArray(), function () {
- if (this.name == 'orderCode') {
- searchData.orderCode = this.value;
- }
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
if (this.name == 'orderTime') {
searchData.startTime = this.value.substring(0, 10);
searchData.endTime = this.value.substring(13, this.value.length);
}
});
-
- console.log(searchData);
-
(child ? parent.tableIns : tableIns).reload({
where: searchData,
page: {
@@ -113,24 +111,61 @@
},
done: function (res, curr, count) {
if (res.code === 403) {
- top.location.href = baseUrl + "/";
+ top.location.href = baseUrl+"/";
}
- pageCurr = curr;
+ pageCurr=curr;
if (res.data.length === 0 && count !== 0) {
tableIns.reload({
where: searchData,
page: {
- curr: pageCurr - 1
+ curr: pageCurr-1
}
});
pageCurr -= 1;
}
- limit(child);
- // 褰撳墠鍒嗛〉鏁版嵁瀛樺偍
- locNormalList = res.data;
+ // limit(child);
}
});
}
+// function tableReload(child) {
+// var searchData = {};
+// $.each($('#search-box [name]').serializeArray(), function () {
+// if (this.name == 'orderCode') {
+// searchData.orderCode = this.value;
+// }
+// if (this.name == 'orderTime') {
+// searchData.startTime = this.value.substring(0, 10);
+// searchData.endTime = this.value.substring(13, this.value.length);
+// }
+// });
+//
+// console.log(searchData);
+//
+// (child ? parent.tableIns : tableIns).reload({
+// where: searchData,
+// page: {
+// curr: pageCurr
+// },
+// done: function (res, curr, count) {
+// if (res.code === 403) {
+// top.location.href = baseUrl + "/";
+// }
+// pageCurr = curr;
+// if (res.data.length === 0 && count !== 0) {
+// tableIns.reload({
+// where: searchData,
+// page: {
+// curr: pageCurr - 1
+// }
+// });
+// pageCurr -= 1;
+// }
+// // limit(child);
+// // 褰撳墠鍒嗛〉鏁版嵁瀛樺偍
+// locNormalList = res.data;
+// }
+// });
+// }
/* 鐩戝惉鍥炶溅浜嬩欢 */
$('body').keydown(function () {
diff --git a/src/main/webapp/views/salesOrder/salesOrder.html b/src/main/webapp/views/salesOrder/salesOrder.html
index 85996cc..6c2c355 100644
--- a/src/main/webapp/views/salesOrder/salesOrder.html
+++ b/src/main/webapp/views/salesOrder/salesOrder.html
@@ -50,6 +50,31 @@
<input class="layui-input" type="text" name="orderCode" placeholder="璁㈠崟鍙�" autocomplete="off">
</div>
</div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="invCode" placeholder="鐗╂枡缂栫爜" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="invName" placeholder="鐗╂枡鍚嶇О" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="invStd" placeholder="瑙勬牸鍨嬪彿" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="personName" placeholder="涓氬姟鍛�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
+ </div>
+ </div>
<!-- 鏃ユ湡鑼冨洿 -->
<div class="layui-inline" style="width: 300px">
--
Gitblit v1.9.1