From 3edce29be0469ac174df5ebc475293aee1b556a5 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期日, 23 四月 2023 14:15:58 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/WorkService.java | 2
src/main/java/com/zy/asrs/mapper/LocDetlMapper.java | 2
src/main/java/com/zy/asrs/service/LocDetlService.java | 2
src/main/resources/mapper/LocDetlMapper.xml | 10 +++
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 5 +
src/main/java/com/zy/asrs/controller/WorkController.java | 14 ++++
src/main/java/com/zy/asrs/entity/param/EmptyPlateOutParam.java | 35 +++++++++++
src/main/resources/mapper/AdjDetlMapper.xml | 1
src/main/webapp/views/adjDetl/adjDetl.html | 7 ++
src/main/webapp/static/js/matTurn/matTurn.js | 28 ---------
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 10 +++
src/main/webapp/static/js/adjDetl/adjDetl.js | 3
src/main/java/com/zy/asrs/controller/MatController.java | 7 --
src/main/java/com/zy/asrs/entity/AdjDetl.java | 9 ++
14 files changed, 98 insertions(+), 37 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index e79b7e8..53e9135 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -169,13 +169,6 @@
return R.ok(matService.getMatTurnPage(toPage(curr, limit, param, Mat.class)));
}
- @RequestMapping("/mat/turn/over/out/start")
- @ManagerAuth(memo = "鍝佸彿绉讳氦")
- public R turnOverOutStart(@RequestBody EmptyPlateOutParam param) {
-
- return R.ok("鍝佸彿绉讳氦鎴愬姛");
- }
-
@RequestMapping("/mat/turn/over/take/site")
@ManagerAuth()
public R availableTakeSite(@RequestParam(required = false) String matnr){
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index eae764b..8b6a223 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -1,6 +1,7 @@
package com.zy.asrs.controller;
import com.core.annotations.ManagerAuth;
+import com.core.common.Cools;
import com.core.common.R;
import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.entity.param.EmptyPlateOutParam;
@@ -120,6 +121,19 @@
return R.ok("绉诲簱鍚姩鎴愬姛");
}
+ @RequestMapping("/mat/turn/over/out/start")
+ @ManagerAuth(memo = "鍝佸彿绉讳氦")
+ public R turnMatLocDetl(@RequestBody EmptyPlateOutParam param) {
+ if (Cools.isEmpty(param) || Cools.isEmpty(param.getLocDetls(),param.getMatId()) || Cools.isEmpty(param.getLocDetls().get(0)) || Cools.isEmpty(param.getLocDetls().get(0).getMatnr())){
+ return R.error("鍙傛暟涓虹┖");
+ }
+ if (param.getLocDetls().size()>1){
+ return R.error("璇峰崟鏉℃暟鎹慨鏀癸紝璋ㄦ厧鎿嶄綔锛�");
+ }
+ workService.turnMatLocDetl(param, getUserId());
+ return R.ok("鍝佸彿绉讳氦鎴愬姛");
+ }
+
@RequestMapping("/locDdetl/adjust/start")
@ManagerAuth(memo = "搴撳瓨璋冩暣")
public R locDetlAdjustStart(@RequestBody LocDetlAdjustParam param) {
diff --git a/src/main/java/com/zy/asrs/entity/AdjDetl.java b/src/main/java/com/zy/asrs/entity/AdjDetl.java
index 7d4c75a..e6a3cc0 100644
--- a/src/main/java/com/zy/asrs/entity/AdjDetl.java
+++ b/src/main/java/com/zy/asrs/entity/AdjDetl.java
@@ -40,10 +40,17 @@
/**
* 鍟嗗搧缂栧彿
*/
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
+ @ApiModelProperty(value= "鍙樻洿鍟嗗搧缂栧彿")
private String matnr;
/**
+ * 鍟嗗搧缂栧彿
+ */
+ @ApiModelProperty(value= "鍟嗗搧缂栧彿")
+ @TableField("matnr_old")
+ private String matnrOld;
+
+ /**
* 鎵瑰彿
*/
@ApiModelProperty(value= "鎵瑰彿")
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 4a41c37..b226ce2 100644
--- a/src/main/java/com/zy/asrs/entity/param/EmptyPlateOutParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/EmptyPlateOutParam.java
@@ -1,10 +1,13 @@
package com.zy.asrs.entity.param;
+import lombok.Data;
+
import java.util.List;
/**
* Created by vincent on 2020/6/13
*/
+@Data
public class EmptyPlateOutParam {
// 鍑虹珯鍙�
@@ -16,6 +19,38 @@
// 搴撲綅鍙烽泦鍚�
private List<String> locNos;
+ // 鐗╂枡缂栧彿闆嗗悎
+ private List<EmptyPlateOutParam.LocDetl> locDetls;
+
+ @Data
+ public static class LocDetl {
+
+ // 鍟嗗搧id
+ private Integer matId;
+
+ // 鍟嗗搧缂栧彿
+ private String matnr;
+
+ // 鍟嗗搧缂栧彿
+ private String maktx;
+
+ // 鍟嗗搧缂栧彿
+ private String specs;
+
+ // 搴忓垪鐮�
+ private String batch;
+
+ // 鏁伴噺
+ private Double count;
+
+ // 璁㈠崟
+ private String orderNo;
+
+ // 缈诲寘
+ private String memo;
+
+ }
+
public Integer getOutSite() {
return outSite;
}
diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index c33ab13..771b750 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -67,4 +67,6 @@
Double selectLocDetlSumQty(String locNo);
+ void updateMatTurn(@Param("matnrOld")String matnrOld,@Param("matnr")String matnr);
+
}
diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
index 0023ecf..ee17ba1 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -55,4 +55,6 @@
List<LocDetl> unreason();
Double getLocDetlSumQty(String locNo);
+
+ void updateMatTurn(String matnrOld,String matnr);
}
diff --git a/src/main/java/com/zy/asrs/service/WorkService.java b/src/main/java/com/zy/asrs/service/WorkService.java
index e0cce87..99fdc5e 100644
--- a/src/main/java/com/zy/asrs/service/WorkService.java
+++ b/src/main/java/com/zy/asrs/service/WorkService.java
@@ -95,4 +95,6 @@
*/
String dealPreHaveStart(Integer wrkNo, Long userId);
+ void turnMatLocDetl(EmptyPlateOutParam param, Long userId);
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
index 44bdd07..3880962 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -116,4 +116,9 @@
public Double getLocDetlSumQty(String locNo) {
return this.baseMapper.selectLocDetlSumQty(locNo);
}
+
+ @Override
+ public void updateMatTurn(String matnrOld,String matnr){
+ this.baseMapper.updateMatTurn(matnrOld,matnr);
+ }
}
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 c5b55e0..f4a0121 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -1122,4 +1122,14 @@
return targetLoc.getLocNo();
}
+ @Override
+ @Transactional
+ public void turnMatLocDetl(EmptyPlateOutParam param, Long userId) {
+ Mat mat = matService.selectOne(new EntityWrapper<Mat>().eq("id", param.getMatId()));
+ if (Cools.isEmpty(mat)){
+ throw new CoolException("鐩爣搴撲綅鍟嗗搧缂栫爜鏈夎锛�");
+ }
+ locDetlService.updateMatTurn(param.getLocDetls().get(0).getMatnr(),mat.getMatnr());
+ }
+
}
diff --git a/src/main/resources/mapper/AdjDetlMapper.xml b/src/main/resources/mapper/AdjDetlMapper.xml
index dd97389..2aafe74 100644
--- a/src/main/resources/mapper/AdjDetlMapper.xml
+++ b/src/main/resources/mapper/AdjDetlMapper.xml
@@ -7,6 +7,7 @@
<id column="adj_id" property="adjId" />
<result column="loc_no" property="locNo" />
<result column="matnr" property="matnr" />
+ <result column="matnr_old" property="matnrOld" />
<result column="batch" property="batch" />
<result column="ori_ctns" property="oriCtns" />
<result column="ori_qty" property="oriQty" />
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 4240f6c..d41392b 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -326,5 +326,15 @@
where loc_no=#{locNo}
</select>
+ <update id="updateMatTurn">
+ UPDATE a
+ SET a.matnr=b.matnr,
+ a.specs=b.specs,
+ a.maktx=b.maktx,
+ a.unit=b.unit
+ FROM asr_loc_detl a
+ INNER JOIN man_mat b ON a.matnr=#{matnrOld} AND b.matnr=#{matnr};
+ </update>
+
</mapper>
diff --git a/src/main/webapp/static/js/adjDetl/adjDetl.js b/src/main/webapp/static/js/adjDetl/adjDetl.js
index cf5c1f8..1fe7723 100644
--- a/src/main/webapp/static/js/adjDetl/adjDetl.js
+++ b/src/main/webapp/static/js/adjDetl/adjDetl.js
@@ -22,7 +22,8 @@
// ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
// {field: 'adjId', align: 'center',title: '搴忓彿'}
{field: 'locNo', align: 'center',title: '搴撲綅鍙�'}
- ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿'}
+ ,{field: 'matnrOld', align: 'center',title: '鍘熷搧鍙�'}
+ ,{field: 'matnr', align: 'center',title: '褰撳墠鍝佸彿'}
,{field: 'batch', align: 'center',title: '鎵瑰彿'}
// ,{field: 'oriCtns', align: 'center',title: '鍘熺鏁�'}
,{field: 'oriQty', align: 'center',title: '鍘熸暟閲�'}
diff --git a/src/main/webapp/static/js/matTurn/matTurn.js b/src/main/webapp/static/js/matTurn/matTurn.js
index 60c3b72..906f369 100644
--- a/src/main/webapp/static/js/matTurn/matTurn.js
+++ b/src/main/webapp/static/js/matTurn/matTurn.js
@@ -42,33 +42,6 @@
}
});
- // 椤甸潰淇敼
- table.on('edit(chooseData)', function (obj) {
- let index = obj.tr.attr("data-index");
- let data = locDetlData[index];
- let modify = true;
- if (obj.field === 'count'){
- let vle = Number(obj.value);
- if (isNaN(vle)) {
- layer.msg("璇疯緭鍏ユ暟瀛�", {icon: 2});
- modify = false;
- } else {
- if (vle <= 0) {
- layer.msg("鏁伴噺蹇呴』澶т簬闆�", {icon: 2});
- modify = false;
- }
- if (vle > Number(data.anfme)) {
- layer.msg("鍑哄簱鏁伴噺涓嶅緱澶т簬搴撳瓨鏁伴噺", {icon: 2});
- modify = false;
- }
- }
- }
- if (modify) {
- data[obj.field] = obj.value;
- }
- tableIns.reload({data: locDetlData});
- });
-
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
table.on('toolbar(chooseData)', function (obj) {
switch (obj.event) {
@@ -85,6 +58,7 @@
matId: staNo,
locDetls: locDetlData
}
+ console.log(param)
$.ajax({
url: baseUrl+"/mat/turn/over/out/start",
headers: {'token': localStorage.getItem('token')},
diff --git a/src/main/webapp/views/adjDetl/adjDetl.html b/src/main/webapp/views/adjDetl/adjDetl.html
index ff4a9d8..5c77216 100644
--- a/src/main/webapp/views/adjDetl/adjDetl.html
+++ b/src/main/webapp/views/adjDetl/adjDetl.html
@@ -21,7 +21,12 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧" autocomplete="off">
+ <input class="layui-input" type="text" name="matnr" placeholder="褰撳墠鍝佸彿" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="matnr_old" placeholder="鍘熷搧鍙�" autocomplete="off">
</div>
</div>
<!-- 鏃ユ湡鑼冨洿 -->
--
Gitblit v1.9.1