From 2aa37a30dd1468c8c489273c99ffcb33c6dff737 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 11 三月 2021 16:20:46 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/entity/param/InitOrderParam.java | 2 +
src/main/webapp/static/js/ioWorks/matQuery.js | 54 +++++++++++++++++----------
src/main/webapp/static/js/custOrder/custOrder.js | 2
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java | 29 ++++++++++++++
4 files changed, 65 insertions(+), 22 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/entity/param/InitOrderParam.java b/src/main/java/zy/cloud/wms/manager/entity/param/InitOrderParam.java
index 25ff509..e1dab0f 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/param/InitOrderParam.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/param/InitOrderParam.java
@@ -12,6 +12,8 @@
private String number;
+ private String customerTypeId;
+
private List<PakinMatDto> list;
}
diff --git a/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java b/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
index 09cbc88..97e3447 100644
--- a/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
+++ b/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
+import com.core.common.DateUtils;
import com.core.common.R;
import com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
@@ -39,6 +40,8 @@
private PakoutService pakoutService;
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
+ @Autowired
+ private MatService matService;
@Override
@Transactional
@@ -213,7 +216,31 @@
@Override
@Transactional
public R initOrder(InitOrderParam param, Long userId) {
- return null;
+ Date now = new Date();
+ for (PakinMatDto dto : param.getList()){
+ Mat mat = matService.selectByMatnr(dto.getMatnr());
+ if (mat == null) {
+ continue;
+ }
+ CustOrder custOrder = new CustOrder(
+ param.getNumber(), // 閿�鍞崟鍙�
+ DateUtils.convert(now), // 鍗曟嵁鏃ユ湡[闈炵┖]
+ param.getCustomerTypeId(), // 瀹㈡埛缂栧彿
+ null, // 缁忔墜浜虹紪鍙穂绌篯
+ dto.getMatnr(), // 鍟嗗搧缂栧彿
+ dto.getCount(), // 鍟嗗搧鏁伴噺
+ Cools.isEmpty(mat.getName())?0.0D:Double.parseDouble(mat.getName()), // 鍟嗗搧鍗曚环
+ null, // 鍟嗗搧澶囨敞[绌篯
+ 1, // 鐘舵��
+ now, // 娣诲姞鏃堕棿
+ now, // 淇敼鏃堕棿
+ null // 澶囨敞
+ );
+ if (!custOrderService.insert(custOrder)) {
+ throw new CoolException("淇濆瓨閿�鍞鍗曞け璐�");
+ }
+ }
+ return R.ok("鐢熸垚閿�鍞鍗�" + param.getNumber() + "鎴愬姛");
}
}
diff --git a/src/main/webapp/static/js/custOrder/custOrder.js b/src/main/webapp/static/js/custOrder/custOrder.js
index 5a4f5ec..3af1003 100644
--- a/src/main/webapp/static/js/custOrder/custOrder.js
+++ b/src/main/webapp/static/js/custOrder/custOrder.js
@@ -144,7 +144,7 @@
success: function (res) {
if (res.code === 200){
layer.closeAll();
- tableReload(false);
+ $(".layui-laypage-btn")[0].click();
} else if (res.code === 403){
top.location.href = baseUrl+"/";
} else {
diff --git a/src/main/webapp/static/js/ioWorks/matQuery.js b/src/main/webapp/static/js/ioWorks/matQuery.js
index e0703ac..3721713 100644
--- a/src/main/webapp/static/js/ioWorks/matQuery.js
+++ b/src/main/webapp/static/js/ioWorks/matQuery.js
@@ -43,20 +43,30 @@
if (data.length === 0){
layer.msg('璇锋坊鍔犵墿鏂�');
} else {
- layer.open({
- type: 1,
- title: '瀹氫箟閿�鍞崟缂栧彿',
- offset: '100px',
- area: ['360px'],
- shade: 0.1,
- content: $('#getOrderNo'),
- success: function(layero, index){
- layer.iframeAuto(index)
- },
- cancel: function () {
- $('#orderNo').val('');
+ var success = true;
+ for (var i=0;i<matData.length;i++) {
+ if (matData[i].count <= 0) {
+ layer.msg(matData[i].matnr + '鐗╂枡鏁伴噺蹇呴』澶т簬闆讹紒', {icon: 2})
+ success = false;
+ return false;
}
- });
+ }
+ if (success) {
+ layer.open({
+ type: 1,
+ title: '瀹氫箟閿�鍞崟缂栧彿',
+ offset: '100px',
+ area: ['360px'],
+ shade: 0.1,
+ content: $('#getOrderNo'),
+ success: function(layero, index){
+ layer.iframeAuto(index)
+ },
+ cancel: function () {
+ $('#orderNo').val('');
+ }
+ });
+ }
}
break;
}
@@ -83,21 +93,26 @@
form.on('submit(confirm)', function (data) {
var matDetls = [];
matData.forEach(function(elem) {
- matDetls.push({matnr: elem.matnr, count: elem.count});
+ matDetls.push({matnr: elem.matnr
+ , count: elem.count
+
+ });
});
+ var req = JSON.stringify({
+ number: data.field.orderNo
+ , customerTypeId: '1'
+ , list: matDetls
+ })
$.ajax({
url: baseUrl+"/work/order/init",
headers: {'token': localStorage.getItem('token')},
- data: JSON.stringify({
- number: data.field.orderNo,
- list: matDetls
- }),
+ data: req,
contentType:'application/json;charset=UTF-8',
method: 'POST',
success: function (res) {
if (res.code === 200){
- top.layui.layer.close(top.popupRight);
layer.msg(res.msg, {icon: 1});
+ top.layui.layer.close(top.popupRight);
} else if (res.code === 403){
top.location.href = baseUrl+"/";
} else {
@@ -105,7 +120,6 @@
}
}
});
-
})
function updateMatData(locNo, matnr, count) {
--
Gitblit v1.9.1