From 2facff7a8993d2ff6412ef70e477d3d4996892a6 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期三, 16 三月 2022 16:56:29 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/entity/ReceiveLog.java | 7 +++
src/main/webapp/views/receiveDetl/receiveDetl.html | 5 ++
src/main/resources/mapper/ReceiveLogMapper.xml | 1
src/main/java/zy/cloud/wms/manager/controller/ReceiveDetlController.java | 72 ++++++++++++++++++++++++++++++++----
src/main/webapp/static/js/receiveDetl/receiveDetl.js | 32 ++++++++++++++++
5 files changed, 109 insertions(+), 8 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/ReceiveDetlController.java b/src/main/java/zy/cloud/wms/manager/controller/ReceiveDetlController.java
index 0dc4932..10bc7c4 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ReceiveDetlController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ReceiveDetlController.java
@@ -6,14 +6,10 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.DateUtils;
-import zy.cloud.wms.manager.entity.LocDetl;
-import zy.cloud.wms.manager.entity.Node;
-import zy.cloud.wms.manager.entity.ReceiveDetl;
-import zy.cloud.wms.manager.entity.ReceiveLog;
+import org.springframework.transaction.annotation.Transactional;
+import zy.cloud.wms.manager.entity.*;
import zy.cloud.wms.manager.entity.dto.PutShelfDTO;
-import zy.cloud.wms.manager.service.LocDetlService;
-import zy.cloud.wms.manager.service.NodeService;
-import zy.cloud.wms.manager.service.ReceiveDetlService;
+import zy.cloud.wms.manager.service.*;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
@@ -21,7 +17,6 @@
import zy.cloud.wms.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import zy.cloud.wms.manager.service.ReceiveLogService;
import java.util.*;
@@ -36,6 +31,8 @@
private NodeService nodeService;
@Autowired
private ReceiveLogService receiveLogService;
+ @Autowired
+ private ReceiveService receiveService;
@RequestMapping(value = "/receiveDetl/{id}/auth")
@ManagerAuth
@@ -209,8 +206,67 @@
receiveLog.setBatch(putShelfDTO.getBatch());
receiveLog.setCreateBy(getUserId());
receiveLog.setUpdateBy(getUserId());
+ receiveLog.setIoType(1);
receiveLogService.insert(receiveLog);
return R.ok("娣诲姞鎴愬姛");
}
+ /**
+ * 鎾ら攢涓婃灦鎿嶄綔
+ */
+ @RequestMapping("/receiveDetl/renew/auth")
+ @ManagerAuth
+ @Transactional
+ public R renew(@RequestBody ReceiveDetl receiveDetl){
+ /**
+ * 鎺х
+ */
+ if (receiveDetl.getInQty() <= 0){
+ return R.error("娌℃湁涓婃灦璁板綍,鏃犳硶鎾ゅ洖");
+ }
+ Receive receive = receiveService.selectOne(new EntityWrapper<Receive>()
+ .eq("id", receiveDetl.getOrderId()));
+ if (Cools.isEmpty(receive)) {
+ return R.error("鎵句笉鍒拌鍗曟嵁,璇疯仈绯荤鐞嗗憳");
+ }
+ if (receive.getSettle() == 4){
+ return R.error("璇ュ崟鎹凡缁忓畬缁�");
+ }
+
+ /**
+ * 淇敼搴撳瓨鏁伴噺,鍚屾椂鎾ゅ洖涓婃灦瀹屾垚鍚�,灏嗘搷浣滆褰曞弽鍐欏洖涓婃灦缁熻琛� man_receive_log
+ */
+ List<ReceiveLog> receiveLogs = receiveLogService.selectList(new EntityWrapper<ReceiveLog>()
+ .eq("order_no", receiveDetl.getOrderNo())
+ .eq("matnr", receiveDetl.getMatnr())
+ .eq("batch", receiveDetl.getBatch())
+ .eq("io_type", 1));
+ if (!Cools.isEmpty(receiveLogs)) {
+ return R.error("鎵句笉鍒板叆搴撹褰�");
+ }
+ for (ReceiveLog receiveLog : receiveLogs) {
+ locDetlService.delete(new EntityWrapper<LocDetl>()
+ .eq("loc_no",receiveLog.getNodeName())
+ .eq("matnr",receiveLog.getMatnr())
+ .eq("batch",receiveLog.getBatch()));
+ receiveLog.setIoType(101);
+ receiveLog.setCreateBy(getUserId());
+ receiveLog.setUpdateBy(getUserId());
+ receiveLogService.insert(receiveLog);
+ }
+
+ /**
+ * 鍙嶅啓鍥炲叆搴撴。
+ */
+ receiveDetl.setInQty(0);
+ receiveDetl.setUpdateTime(new Date());
+ receiveDetl.setUpdateBy(getUserId());
+ receiveDetlService.update(receiveDetl,new EntityWrapper<ReceiveDetl>()
+ .eq("id",receiveDetl.getId()));
+
+
+
+ return R.ok("鎾ゅ洖鎴愬姛");
+ }
+
}
diff --git a/src/main/java/zy/cloud/wms/manager/entity/ReceiveLog.java b/src/main/java/zy/cloud/wms/manager/entity/ReceiveLog.java
index b4ad661..df3c0f2 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/ReceiveLog.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/ReceiveLog.java
@@ -13,6 +13,8 @@
import java.text.SimpleDateFormat;
import java.util.Date;
import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import io.swagger.annotations.ApiModelProperty;
import java.text.SimpleDateFormat;
@@ -24,6 +26,8 @@
import com.baomidou.mybatisplus.annotations.TableName;
import java.io.Serializable;
+@Data
+@AllArgsConstructor
@TableName("man_receive_log")
public class ReceiveLog implements Serializable {
@@ -111,6 +115,9 @@
@TableField("node_name")
private String nodeName;
+ @TableField("io_type")
+ private Integer ioType;
+
public ReceiveLog() {}
public ReceiveLog(String orderNo,Long nodeId,String matnr,Double anfme,String batch,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo,String nodeName) {
diff --git a/src/main/resources/mapper/ReceiveLogMapper.xml b/src/main/resources/mapper/ReceiveLogMapper.xml
index 805c718..97ed1be 100644
--- a/src/main/resources/mapper/ReceiveLogMapper.xml
+++ b/src/main/resources/mapper/ReceiveLogMapper.xml
@@ -16,6 +16,7 @@
<result column="update_time" property="updateTime" />
<result column="memo" property="memo" />
<result column="node_name" property="nodeName" />
+ <result column="io_type" property="ioType" />
</resultMap>
diff --git a/src/main/webapp/static/js/receiveDetl/receiveDetl.js b/src/main/webapp/static/js/receiveDetl/receiveDetl.js
index 8bae838..46ba744 100644
--- a/src/main/webapp/static/js/receiveDetl/receiveDetl.js
+++ b/src/main/webapp/static/js/receiveDetl/receiveDetl.js
@@ -192,6 +192,9 @@
// showEditModel(data);
startIn(data);
break;
+ case "renew":
+ renew(data);
+ break;
}
});
function startIn(data) {
@@ -325,6 +328,35 @@
});
}
+ function renew(data) {
+ console.log(data)
+ layer.confirm('纭畾瑕佹挙鍥炲叏閮ㄤ笂鏋舵暟鎹悧锛�', {
+ skin: 'layui-layer-admin',
+ shade: .1
+ }, function (i) {
+ layer.close(i);
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/receiveDetl/renew/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(data),
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ });
+ }
+
// 鎼滅储
form.on('submit(search)', function (data) {
pageCurr = 1;
diff --git a/src/main/webapp/views/receiveDetl/receiveDetl.html b/src/main/webapp/views/receiveDetl/receiveDetl.html
index da14da1..2dd6569 100644
--- a/src/main/webapp/views/receiveDetl/receiveDetl.html
+++ b/src/main/webapp/views/receiveDetl/receiveDetl.html
@@ -44,6 +44,7 @@
<script type="text/html" id="operate">
<!-- <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>-->
<a class="layui-btn layui-btn-normal layui-btn-xs btn-edit" lay-event="add">涓婃灦</a>
+ <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="renew">鎾ら攢涓婃灦</a>
<!-- <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>-->
</script>
@@ -154,6 +155,10 @@
</div>
</form>
</script>
+
+<script type="text/html" id="renew">
+
+</script>
<!-- 琛ㄥ崟寮圭獥 -->
<script type="text/html" id="editDialog">
<form id="detail" lay-filter="detail" class="layui-form admin-form">
--
Gitblit v1.9.1