From 1cf3f1550a847b05cc6ec9c474b304f503aa9fc6 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 19 七月 2023 11:06:10 +0800
Subject: [PATCH] #货物形态转换解除限制，正反向随意
---
src/main/java/com/zy/asrs/entity/result/LocDetlDTO.java | 1
src/main/webapp/static/js/pakStore/turnOver2.js | 13 +++---
src/main/java/com/zy/asrs/controller/LocDetlController.java | 4 ++
src/main/java/com/zy/asrs/controller/OpenController.java | 1
src/main/webapp/views/pakStore/turnOverQuery.html | 7 +++
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 8 +++-
src/main/resources/mapper/LocDetlMapper.xml | 7 ++-
src/main/webapp/views/pakStore/turnOverPayment.html | 14 ++++---
src/main/java/com/zy/asrs/controller/WorkController.java | 2
src/main/java/com/zy/asrs/entity/param/EmptyPlateOutParam.java | 12 ++++++
10 files changed, 51 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index 1a714d1..d0ccb1c 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -345,6 +345,7 @@
String locNo = String.valueOf(param.get("locNo"));
String owner = String.valueOf(param.get("owner"));
String matnr = String.valueOf(param.get("matnr"));
+ String payment = String.valueOf(param.get("payment"));
if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
locDetlDTO.setLocNo(locNo);
}
@@ -354,6 +355,9 @@
if (!Cools.isEmpty(owner) && !owner.equals("null")) {
locDetlDTO.setOwner(owner);
}
+ if (!Cools.isEmpty(payment) && !payment.equals("null")) {
+ locDetlDTO.setPayment(payment);
+ }
List<LocDetlAll> list = locDetlService.selectAllPyment(locDetlDTO);
int count = locDetlService.selectAllPymentcount(locDetlDTO);
Page<LocDetlAll> page = new Page<>();
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 8f565ae..3b86a9c 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -51,6 +51,7 @@
* 娣诲姞鍏ュ簱鍗�
*/
@PostMapping("/order/pakin/default/v1")
+ @AppAuth(memo = "娣诲姞璁㈠崟鍏ュ簱")
public synchronized R pakinOrderCreate(@RequestHeader(required = false) String appkey,
@RequestBody OpenOrderPakinParam param,
HttpServletRequest request) {
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index b3406ea..d656b7a 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -103,7 +103,7 @@
@ManagerAuth(memo = "璐х墿褰㈡�佽浆鎹�")
public R turnOverOutStartPayment(@RequestBody EmptyPlateOutParam param) {
workService.turnOverOutPayment(param, getUserId());
- return R.ok("璐х墿褰㈡�佸凡杞负浠撳偍");
+ return R.ok("璐х墿褰㈡�佸凡杞负"+param.getPayment$(param.getPayment()));
}
@RequestMapping("/empty/plate/in/start")
diff --git a/src/main/java/com/zy/asrs/entity/param/EmptyPlateOutParam.java b/src/main/java/com/zy/asrs/entity/param/EmptyPlateOutParam.java
index 1ca3d86..bd2d524 100644
--- a/src/main/java/com/zy/asrs/entity/param/EmptyPlateOutParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/EmptyPlateOutParam.java
@@ -19,6 +19,9 @@
// 瀹㈡埛id
private Integer ownerId;
+ //璐х墿褰㈡��
+ private Integer payment;
+
// 搴撲綅鍙烽泦鍚�
private List<String> locNos;
@@ -66,4 +69,13 @@
public void setLocNos(List<String> locNos) {
this.locNos = locNos;
}
+
+ public String getPayment$(Integer payment){
+ if (payment.equals(0)){
+ return "浠ｉ噰";
+ }else if (payment.equals(1)){
+ return "浠撳偍";
+ }
+ return payment.toString();
+ }
}
diff --git a/src/main/java/com/zy/asrs/entity/result/LocDetlDTO.java b/src/main/java/com/zy/asrs/entity/result/LocDetlDTO.java
index 37f9145..61c3820 100644
--- a/src/main/java/com/zy/asrs/entity/result/LocDetlDTO.java
+++ b/src/main/java/com/zy/asrs/entity/result/LocDetlDTO.java
@@ -11,4 +11,5 @@
private String locNo;
private String matnr;
private String owner;
+ private String payment;
}
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 01bc2bf..df878dd 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -1188,6 +1188,10 @@
@Override
@Transactional
public void turnOverOutPayment(EmptyPlateOutParam param, Long userId) {
+ if (Cools.isEmpty(param.getPayment())){
+ throw new CoolException("璇烽�夋嫨鐩爣璐х墿褰㈡��");
+ }
+ log.info("鏇存柊璐х墿褰㈡�侊細鐩爣璐х墿褰㈡�侊細"+param.getPayment$(param.getPayment())+";鏇存敼璐х墿淇℃伅锛�"+param.getLocDetls());
try {
if (param.getLocDetls().size()<=0){
throw new CoolException("璇锋彁鍙栨槑缁�");
@@ -1208,7 +1212,7 @@
if (locNo1[1].equals("骞冲簱")){
List<ManLocDetl> manLocDetls = manLocDetlService.selectList(new EntityWrapper<ManLocDetl>().eq("loc_no", locNo));
for (ManLocDetl manLocDetl:manLocDetls){
- manLocDetl.setPayment(1);
+ manLocDetl.setPayment(param.getPayment());
try{
manLocDetlService.update(manLocDetl,new EntityWrapper<ManLocDetl>().eq("loc_no", locNo).eq("matnr",manLocDetl.getMatnr()));
}catch (Exception e){
@@ -1218,7 +1222,7 @@
}else if (locNo1[1].equals("绔嬪簱")){
List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", locNo));
for (LocDetl locDetl:locDetls){
- locDetl.setPayment(1);
+ locDetl.setPayment(param.getPayment());
try{
locDetlService.update(locDetl,new EntityWrapper<LocDetl>().eq("loc_no", locNo).eq("matnr",locDetl.getMatnr()));
}catch (Exception e){
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index dd8592b..82b0450 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -509,6 +509,9 @@
<if test="owner != null and owner !='' ">
and t.owner like '%' + #{owner} + '%'
</if>
+ <if test="payment != null and payment !='' ">
+ and t.payment = #{payment}
+ </if>
</sql>
<select id="selectAllOwner" resultType="com.zy.asrs.entity.result.LocDetlAll" parameterType="com.zy.asrs.entity.result.LocDetlDTO">
@@ -536,7 +539,7 @@
SELECT ROW_NUMBER() over(order by matnr) as row,* FROM (
SELECT * FROM asr_loc_detl_all
) t
- WHERE 1=1 and t.payment = 0
+ WHERE 1=1
<include refid="selectAllSql"></include>
) a
WHERE a.row BETWEEN ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
@@ -549,7 +552,7 @@
SELECT ROW_NUMBER() over(order by matnr) as row,* FROM (
SELECT * FROM asr_loc_detl_all
) t
- WHERE 1=1 and t.payment = 0
+ WHERE 1=1
<include refid="selectAllSql"></include>
) a
diff --git a/src/main/webapp/static/js/pakStore/turnOver2.js b/src/main/webapp/static/js/pakStore/turnOver2.js
index b503792..cee831d 100644
--- a/src/main/webapp/static/js/pakStore/turnOver2.js
+++ b/src/main/webapp/static/js/pakStore/turnOver2.js
@@ -3,7 +3,7 @@
function getCol() {
var cols = [
{field: 'anfme', align: 'center',title: '搴撳瓨鏁伴噺'}
- ,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
+ ,{field: 'loc_no', align: 'center',title: '搴撲綅鍙�'}
];
arrRemove(detlCols, 'field', 'anfme');
cols.push.apply(cols, detlCols);
@@ -77,12 +77,13 @@
if (locDetlData.length === 0){
layer.msg('璇峰厛鎻愬彇鍟嗗搧搴撳瓨', {icon: 2});
} else {
- // var staNo = $("#staNoSelect").val();
- // if (staNo === "" || staNo === null){
- // layer.msg("璇烽�夋嫨鐩爣璐т富", {icon: 2});
- // return;
- // }
+ var payment = $("#staNoPaymentSelect").val();
+ if (payment === "" || payment === null){
+ layer.msg("璇烽�夋嫨鐩爣璐х墿褰㈡��", {icon: 2});
+ return;
+ }
let param = {
+ payment: payment,
locDetls: locDetlData
}
$.ajax({
diff --git a/src/main/webapp/views/pakStore/turnOverPayment.html b/src/main/webapp/views/pakStore/turnOverPayment.html
index 90b06eb..f97b7dc 100644
--- a/src/main/webapp/views/pakStore/turnOverPayment.html
+++ b/src/main/webapp/views/pakStore/turnOverPayment.html
@@ -95,13 +95,15 @@
<script type="text/html" id="toolbar">
<div class="layui-form">
<div class="layui-btn-container">
-<!-- <!– 1.閫夋嫨瀹㈡埛 –>-->
-<!-- <span id="staNoSpan">璐т富锛�</span>-->
-<!-- <select id="staNoSelect" lay-verify="required">-->
-<!-- <option value="">璇烽�夋嫨鐩爣璐т富</option>-->
-<!-- </select>-->
+ <!-- 1.閫夋嫨瀹㈡埛 -->
+ <span id="staNoPaymentSpan">璐х墿褰㈡�侊細</span>
+ <select id="staNoPaymentSelect" lay-verify="required">
+ <option value = "" disabled selected hidden > 璇烽�夋嫨鐩爣璐х墿褰㈡�� </option>
+ <option value="0">浠ｉ噰</option>
+ <option value="1">浠撳偍</option>
+ </select>
<!-- 2.鍚姩鍑哄簱 -->
- <button class="layui-btn layui-btn-lg" id="btn-outbound" lay-event="outboundPayment">杞崲璐х墿褰㈡�佷负浠撳偍</button>
+ <button class="layui-btn layui-btn-lg" id="btn-outbound" lay-event="outboundPayment">杞崲璐х墿褰㈡��</button>
</div>
</div>
</script>
diff --git a/src/main/webapp/views/pakStore/turnOverQuery.html b/src/main/webapp/views/pakStore/turnOverQuery.html
index 14b2091..47f5bbb 100644
--- a/src/main/webapp/views/pakStore/turnOverQuery.html
+++ b/src/main/webapp/views/pakStore/turnOverQuery.html
@@ -62,6 +62,11 @@
<input class="layui-input" type="text" name="owner$" placeholder="璐т富" autocomplete="off">
</div>
</div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="payment" placeholder="璐х墿褰㈡��" autocomplete="off">
+ </div>
+ </div>
<!-- 寰呮坊鍔� -->
<div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
<button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
@@ -91,7 +96,7 @@
function getCol() {
var cols = [
{type: 'checkbox'}
- ,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
+ ,{field: 'loc_no', align: 'center',title: '搴撲綅鍙�'}
];
cols.push.apply(cols, detlCols);
cols.push({field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide: true}
--
Gitblit v1.9.1