From 357de6228f120de8072c482d04bd7577e4f5db0b Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 23 三月 2021 16:29:20 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/common/model/BillDto.java | 15 +++++++
src/main/java/zy/cloud/wms/common/service/erp/ErpService.java | 12 +++---
src/main/webapp/views/custOrder/custOrder.html | 2
src/main/webapp/static/js/ioWorks/matQuery.js | 12 +++++-
src/main/webapp/static/js/custOrder/custOrder.js | 2
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java | 25 ++++++++++++
6 files changed, 57 insertions(+), 11 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/common/model/BillDto.java b/src/main/java/zy/cloud/wms/common/model/BillDto.java
new file mode 100644
index 0000000..e35f006
--- /dev/null
+++ b/src/main/java/zy/cloud/wms/common/model/BillDto.java
@@ -0,0 +1,15 @@
+package zy.cloud.wms.common.model;
+
+import lombok.Data;
+
+/**
+ * Created by vincent on 2021/3/23
+ */
+@Data
+public class BillDto {
+
+ private String matnr;
+
+ private Double qty;
+
+}
diff --git a/src/main/java/zy/cloud/wms/common/service/erp/ErpService.java b/src/main/java/zy/cloud/wms/common/service/erp/ErpService.java
index 18c5c8a..aadd904 100644
--- a/src/main/java/zy/cloud/wms/common/service/erp/ErpService.java
+++ b/src/main/java/zy/cloud/wms/common/service/erp/ErpService.java
@@ -7,9 +7,9 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import zy.cloud.wms.common.model.BillDto;
import zy.cloud.wms.common.service.erp.entity.UploadBill;
import zy.cloud.wms.common.service.erp.entity.UploadBillDetail;
-import zy.cloud.wms.manager.entity.Comb;
import zy.cloud.wms.manager.utils.HttpHandler;
import java.util.ArrayList;
@@ -29,9 +29,9 @@
/**
* 鍗曟嵁涓婃姤
*/
- public Boolean uploadBill(List<Comb> combs, Integer docId, String docNumber){
+ public Boolean uploadBill(List<BillDto> dtos, Integer docId, String docNumber){
try {
- if (Cools.isEmpty(combs)) {
+ if (Cools.isEmpty(dtos)) {
return false;
}
UploadBill uploadBill = new UploadBill();
@@ -42,10 +42,10 @@
uploadBill.setVchType(docId);
List<UploadBillDetail> detail = new ArrayList<>();
uploadBill.setDetail(detail);
- for (Comb comb : combs) {
+ for (BillDto dto : dtos) {
UploadBillDetail detl = new UploadBillDetail();
- detl.setUserCode(comb.getMatnr());
- detl.setQty(comb.getAnfme());
+ detl.setUserCode(dto.getMatnr());
+ detl.setQty(dto.getQty());
detl.setPrice(0.0D);
detail.add(detl);
}
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 45bf08c..891e1e2 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
@@ -9,6 +9,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import zy.cloud.wms.common.model.BillDto;
import zy.cloud.wms.common.model.OrderStoDto;
import zy.cloud.wms.common.service.MainService;
import zy.cloud.wms.common.service.asrs.AsrsService;
@@ -112,7 +113,14 @@
}
// 涓婃姤缁檈rp
- if (!erpService.uploadBill(combs, param.getDocType(), docNum)) {
+ List<BillDto> dtos = new ArrayList<>();
+ for (Comb comb : combs) {
+ BillDto billDto = new BillDto();
+ billDto.setMatnr(comb.getMatnr());
+ billDto.setQty(comb.getAnfme());
+ dtos.add(billDto);
+ }
+ if (!erpService.uploadBill(dtos, param.getDocType(), docNum)) {
throw new CoolException("鏃犳硶涓婃姤鑷砮rp");
}
@@ -197,6 +205,21 @@
if (!custOrderService.updateStatus(param.getNumber(), 4)) {
throw new CoolException("淇敼鍗曟嵁鐘舵�佸け璐�");
}
+ // 閲囪喘閫�璐у崟
+ if (param.getNumber().startsWith("PR-")) {
+ List<BillDto> dtos = new ArrayList<>();
+ for (Pakout pakout : pakouts) {
+ BillDto billDto = new BillDto();
+ billDto.setMatnr(pakout.getMatnr());
+ billDto.setQty(pakout.getAnfme());
+ dtos.add(billDto);
+ }
+ // erp鍗曟嵁涓婁紶 -- 閲囪喘閫�璐у崟
+ if (!erpService.uploadBill(dtos, 6, pakouts.get(0).getDocNum())) {
+ throw new CoolException("鏃犳硶涓婃姤鑷砮rp");
+ }
+
+ }
return R.ok();
}
diff --git a/src/main/webapp/static/js/custOrder/custOrder.js b/src/main/webapp/static/js/custOrder/custOrder.js
index bb150c8..beae1f1 100644
--- a/src/main/webapp/static/js/custOrder/custOrder.js
+++ b/src/main/webapp/static/js/custOrder/custOrder.js
@@ -38,7 +38,7 @@
cols: [[
{type: 'checkbox'}
// ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
- ,{field: 'number', align: 'center',title: '閿�鍞崟鍙�'}
+ ,{field: 'number', align: 'center',title: '鍗曞彿'}
,{field: 'btypeId', align: 'center',title: '瀹㈡埛缂栧彿'}
,{field: 'etypeId', align: 'center',title: '缁忔墜浜虹紪鍙�', hide: true}
diff --git a/src/main/webapp/static/js/ioWorks/matQuery.js b/src/main/webapp/static/js/ioWorks/matQuery.js
index 9644c00..4fcf307 100644
--- a/src/main/webapp/static/js/ioWorks/matQuery.js
+++ b/src/main/webapp/static/js/ioWorks/matQuery.js
@@ -64,7 +64,7 @@
if (success) {
layer.open({
type: 1,
- title: '瀹氫箟閿�鍞崟缂栧彿',
+ title: '瀹氫箟閲囪喘閫�璐у崟缂栧彿',
offset: '100px',
area: ['360px'],
shade: 0.1,
@@ -108,8 +108,16 @@
});
});
+ var number = data.field.orderNo; // 鍗曞彿
+ if (number.substring(0, 3) !== 'PR-') {
+ notice.error({
+ title: '娑堟伅閫氱煡',
+ message: '鍗曞彿涓嶇鍚堣鍒欙紝璇蜂互 PR- 寮�澶�'
+ });
+ return false;
+ }
var req = JSON.stringify({
- number: data.field.orderNo
+ number: number
, customerTypeId: data.field.customerTypeId
, list: matDetls
})
diff --git a/src/main/webapp/views/custOrder/custOrder.html b/src/main/webapp/views/custOrder/custOrder.html
index fc73c4d..ddf8b9f 100644
--- a/src/main/webapp/views/custOrder/custOrder.html
+++ b/src/main/webapp/views/custOrder/custOrder.html
@@ -56,7 +56,7 @@
</div>
<script type="text/html" id="toolbar">
<div class="layui-btn-container">
- <button class="layui-btn" onclick="right()" style="background-color: #2F4056">鏂板閿�鍞崟</button>
+ <button class="layui-btn" onclick="right()" style="background-color: #2F4056">鏂板閲囪喘閫�璐у崟</button>
<!-- <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>-->
<button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
<button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">瀵煎嚭</button>
--
Gitblit v1.9.1