From 4812eefba81853615ec8a06a11d79c6a9d17d877 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 25 五月 2023 11:58:03 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/OrderDetlMapper.xml | 3 +++
src/main/webapp/static/js/picking/picking.js | 8 +++++++-
src/main/resources/mapper/PakoutMapper.xml | 3 +++
src/main/webapp/static/js/picking/pickingOrder.js | 2 ++
src/main/java/com/zy/common/model/LocDto.java | 4 +++-
src/main/java/com/zy/asrs/controller/OutController.java | 19 ++++++++++---------
6 files changed, 28 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index e8d4259..2d60d53 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -33,7 +33,7 @@
@Autowired
private LocDetlService locDetlService;
@Autowired
- private LocMastService locMastService;
+ private PakoutService pakoutService;
@Autowired
private StaDescService staDescService;
@Autowired
@@ -71,7 +71,7 @@
for (LocDetl locDetl : locDetls) {
if (issued > 0) {
LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
- issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
+ issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued,locDetl.getOwner(),locDetl.getPayment());
List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), issued >= locDetl.getAnfme() ? 101 : 103);
// LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
// locDetl.getAnfme(), issued < locDetl.getAnfme()? issued : locDetl.getAnfme());
@@ -88,7 +88,7 @@
}
}
if (issued > 0) {
- LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
+ LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued,orderDetl.getOwner(),1);
// LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), 0.0,issued);
locDto.setLack(Boolean.TRUE);
locDtos.add(locDto);
@@ -202,6 +202,7 @@
if (Cools.isEmpty(locDtos)) {
return R.error("骞冲簱鍙傛暟涓虹┖锛屾病鏈夌敓鎴愭嫞璐у崟");
}
+ String uuid = String.valueOf(System.currentTimeMillis());
boolean lack = true;
for (LocDto locDto : locDtos) {
if (!locDto.isLack()) {
@@ -214,10 +215,10 @@
}
for (LocDto locDto:locDtos){
ManLocDetl manLocDetl = manLocDetlService.selectItem(locDto.getLocNo(), locDto.getMatnr(), locDto.getBatch());
- if (!Cools.isEmpty(manLocDetl) && !(locDto.getAnfme()>=manLocDetl.getAnfme())) {
+ if (!Cools.isEmpty(manLocDetl) && !(locDto.getAnfme()>manLocDetl.getAnfme())) {
manLocDetl.setStatus(0);
if (manLocDetlService.update(manLocDetl, new EntityWrapper<ManLocDetl>().eq("uuid", manLocDetl.getUuid()))) {
- if (addPakOUT(locDto).equals(R.ok())) {
+ if (addPakOUT(locDto,uuid).equals(R.ok())) {
Order order = orderService.selectByNo(locDto.getOrderNo());
if (Cools.isEmpty(order)){
return R.error("鏌ヨ璁㈠崟澶辫触锛岃鑱旂郴绠＄悊鍛�"+locDto.getOrderNo());
@@ -240,18 +241,18 @@
}
}
}else if (locDto.getLocNo().equals("绔嬪簱")){
- addPakOUT(locDto).equals(R.ok());
+ addPakOUT(locDto,uuid).equals(R.ok());
}
}
for (LocDto locDto:locDtos){
if (locDto.getLocNo().equals("搴撳瓨涓嶈冻")){
- addPakOUT(locDto).equals(R.ok());
+ addPakOUT(locDto,uuid).equals(R.ok());
}
}
return R.ok();
}
- private R addPakOUT(LocDto locDto){
+ private R addPakOUT(LocDto locDto,String uuid){
ManPakOut manPakOut=new ManPakOut();
manPakOut.setWrkNo(locDto.getOrderNo()+"-"+System.currentTimeMillis());
manPakOut.setWrkSts((long)1);
@@ -267,7 +268,7 @@
manPakOut.setUpdateTime(new Date());
manPakOut.setPayment(locDto.getPayment());
manPakOut.setOwner(locDto.getOwner());
- manPakOut.setUuid(String.valueOf(System.currentTimeMillis()));
+ manPakOut.setUuid(uuid);
if (Cools.isEmpty(manPakOutService.selectOne(new EntityWrapper<ManPakOut>().eq("doc_num",locDto.getOrderNo())))){
manPakOut.setName(locDto.getMaktx());
}
diff --git a/src/main/java/com/zy/common/model/LocDto.java b/src/main/java/com/zy/common/model/LocDto.java
index 20dec99..2bd8484 100644
--- a/src/main/java/com/zy/common/model/LocDto.java
+++ b/src/main/java/com/zy/common/model/LocDto.java
@@ -55,13 +55,15 @@
this.anfme = anfme;
}
- public LocDto(String locNo, String matnr, String maktx, String batch, String orderNo, Double anfme) {
+ public LocDto(String locNo, String matnr, String maktx, String batch, String orderNo, Double anfme,int owner ,int payment) {
this.locNo = locNo;
this.matnr = matnr;
this.maktx = maktx;
this.batch = batch;
this.orderNo = orderNo;
this.anfme = anfme;
+ this.owner = owner;
+ this.payment = payment;
}
public LocDto(String locNo, String matnr, String maktx, String batch, String orderNo, Double anfme, Double needQty) {
diff --git a/src/main/resources/mapper/OrderDetlMapper.xml b/src/main/resources/mapper/OrderDetlMapper.xml
index 57f2b30..4a9ca0e 100644
--- a/src/main/resources/mapper/OrderDetlMapper.xml
+++ b/src/main/resources/mapper/OrderDetlMapper.xml
@@ -45,6 +45,9 @@
<result column="update_by" property="updateBy" />
<result column="update_time" property="updateTime" />
<result column="memo" property="memo" />
+ <result column="owner" property="owner" />
+ <result column="payment" property="payment" />
+ <result column="uuid" property="uuid" />
</resultMap>
diff --git a/src/main/resources/mapper/PakoutMapper.xml b/src/main/resources/mapper/PakoutMapper.xml
index 3843dc5..74df388 100644
--- a/src/main/resources/mapper/PakoutMapper.xml
+++ b/src/main/resources/mapper/PakoutMapper.xml
@@ -30,6 +30,9 @@
<result column="update_by" property="updateBy" />
<result column="update_time" property="updateTime" />
<result column="memo" property="memo" />
+ <result column="owner" property="owner" />
+ <result column="payment" property="payment" />
+ <result column="uuid" property="uuid" />
</resultMap>
diff --git a/src/main/webapp/static/js/picking/picking.js b/src/main/webapp/static/js/picking/picking.js
index 3ec3f59..1f288b2 100644
--- a/src/main/webapp/static/js/picking/picking.js
+++ b/src/main/webapp/static/js/picking/picking.js
@@ -108,7 +108,8 @@
headers: {token: localStorage.getItem('token')},
url: baseUrl+'/ManPakOut/list/auth',
where: {
- doc_num: data.docNum
+ doc_num: data.docNum,
+ uuid: data.uuid
},
page: true,
cellMinWidth: 100,
@@ -116,10 +117,15 @@
{type: 'numbers'}
,{field: 'id', align: 'center',title: 'id', hide:true}
,{field: 'docNum', align: 'center',title: '鎷ｈ揣鍗曞彿'}
+ ,{field: 'uuid', align: 'center',title: 'uuid'}
,{field: 'locNo', align: 'center',title: '搴撲綅'}
,{field: 'matnr', align: 'center',title: '鐗╂枡鍙�'}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
+ ,{field: 'owner$', align: 'center',title: '璐т富'}
+ ,{field: 'payment$', align: 'center',title: '璐х墿褰㈡��'}
+ ,{field: 'owner', align: 'center',title: '璐т富', hide:true}
+ ,{field: 'payment', align: 'center',title: '璐х墿褰㈡��', hide:true}
,{field: 'createTime$', align: 'center',title: '鎿嶄綔鏃堕棿'}
,{field: 'count', align: 'center',title: '瀹屾垚鏁�'}
,{field: 'status$', align: 'center',title: '鐘舵��'}
diff --git a/src/main/webapp/static/js/picking/pickingOrder.js b/src/main/webapp/static/js/picking/pickingOrder.js
index 847332b..df11673 100644
--- a/src/main/webapp/static/js/picking/pickingOrder.js
+++ b/src/main/webapp/static/js/picking/pickingOrder.js
@@ -311,6 +311,8 @@
{field: 'specs', title: '瑙勬牸'},
{field: 'anfme', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
{field: 'workQty', title: '浣滀笟鏁伴噺', minWidth: 100, width: 100},
+ {field: 'owner$', title: '璐т富', minWidth: 100, width: 100},
+ {field: 'payment$', title: '璐х墿褰㈡��', minWidth: 100, width: 100},
// {field: 'unit', title: '鍗曚綅', width: 80},
{field: 'memo', title: '澶囨敞' , edit: true},
{align: 'center', title: '鎿嶄綔', toolbar: '#formSSXMTableBar', minWidth: 80, width: 80, fixed: 'right'}
--
Gitblit v1.9.1