From 2be979cbab3f9799858970eda35e89ecec28a492 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期二, 15 三月 2022 15:13:58 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/entity/LocDetl.java | 1
src/main/webapp/views/receiveDetl/receiveDetl.html | 24 +++++++-
src/main/java/zy/cloud/wms/manager/controller/ReceiveDetlController.java | 75 ++++++++++++++++++++++++-
src/main/java/zy/cloud/wms/manager/entity/ReceiveDetl.java | 2
src/main/webapp/static/js/receiveDetl/receiveDetl.js | 27 +++++++--
src/main/java/zy/cloud/wms/manager/entity/dto/PutShelfDTO.java | 15 +++++
6 files changed, 131 insertions(+), 13 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 65af884..5e9d42e 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ReceiveDetlController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ReceiveDetlController.java
@@ -6,7 +6,12 @@
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.dto.PutShelfDTO;
+import zy.cloud.wms.manager.service.LocDetlService;
+import zy.cloud.wms.manager.service.NodeService;
import zy.cloud.wms.manager.service.ReceiveDetlService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
@@ -23,6 +28,10 @@
@Autowired
private ReceiveDetlService receiveDetlService;
+ @Autowired
+ private LocDetlService locDetlService;
+ @Autowired
+ private NodeService nodeService;
@RequestMapping(value = "/receiveDetl/{id}/auth")
@ManagerAuth
@@ -120,10 +129,70 @@
return R.ok();
}
+ /**
+ * 涓婃灦鍔ㄤ綔,鎻掑叆搴撳瓨鏄庣粏,鏇存柊鍗曟嵁鏄庣粏
+ * @param putShelfDTO
+ * @return
+ */
@RequestMapping("/receiveDetl/addIn")
- public R addIn(@RequestBody ReceiveDetl receiveDetl){
- System.out.println("receiveDetl = " + receiveDetl);
- return R.ok();
+ @ManagerAuth
+ public R addIn(@RequestBody PutShelfDTO putShelfDTO){
+ /**
+ * 鎺х涓庢暟鎹垵濮嬪寲
+ */
+ if (Cools.isEmpty(putShelfDTO.getId(),putShelfDTO.getBatch(),putShelfDTO.getRemain(),putShelfDTO.getSelect())){
+ return R.error("杈撳叆鏁版嵁鏈夎,璇烽噸鏂拌緭鍏�");
+ }
+ Date date = new Date();
+ double remain = Double.parseDouble(putShelfDTO.getRemain());
+ double anfme = Double.parseDouble(putShelfDTO.getAnfme());
+ double inQty = Double.parseDouble(putShelfDTO.getInQty());
+ if (anfme - (remain + inQty) < 0){
+ return R.error("鏈鍏ュ簱鏁伴噺澶т簬鎵�闇�鍏ュ簱鏁伴噺");
+ }
+ Node targetLoc = nodeService.selectOne(new EntityWrapper<Node>()
+ .eq("id", putShelfDTO.getSelect()));
+
+
+ /**
+ * 鏇存柊搴撳瓨
+ */
+ LocDetl checkLoc = locDetlService.selectOne(new EntityWrapper<LocDetl>()
+ .eq("loc_no", targetLoc.getName())
+ .eq("matnr", putShelfDTO.getMatnr())
+ .eq("batch", putShelfDTO.getBatch()));
+ if (Cools.isEmpty(checkLoc)) {
+ LocDetl locDetl = new LocDetl();
+ locDetl.setHostId(getHostId());
+ locDetl.setLocNo(targetLoc.getName());
+ locDetl.setNodeId(targetLoc.getId());
+ locDetl.setAnfme(remain);
+ locDetl.setMatnr(putShelfDTO.getMatnr());
+ locDetl.setMaktx(putShelfDTO.getMaktx());
+ locDetl.setCreateBy(getUserId());
+ locDetl.setCreateTime(date);
+ locDetl.setUpdateBy(getUserId());
+ locDetl.setUpdateTime(date);
+ locDetl.setBatch(putShelfDTO.getBatch());
+ locDetlService.insert(locDetl);
+ }else {
+ checkLoc.setAnfme(checkLoc.getAnfme() + remain);
+ locDetlService.update(checkLoc,new EntityWrapper<LocDetl>()
+ .eq("loc_no", targetLoc.getName())
+ .eq("matnr", putShelfDTO.getMatnr())
+ .eq("batch", putShelfDTO.getBatch()));
+ }
+
+ /**
+ * 鍙嶅啓璁㈠崟鏁伴噺
+ */
+
+ ReceiveDetl targetRece = receiveDetlService.selectOne(new EntityWrapper<ReceiveDetl>()
+ .eq("id", putShelfDTO.getId()));
+ targetRece.setInQty((int) (targetRece.getInQty() + remain));
+ receiveDetlService.update(targetRece,new EntityWrapper<ReceiveDetl>()
+ .eq("id",targetRece.getId()));
+ return R.ok("娣诲姞鎴愬姛");
}
}
diff --git a/src/main/java/zy/cloud/wms/manager/entity/LocDetl.java b/src/main/java/zy/cloud/wms/manager/entity/LocDetl.java
index 48a36fb..a38fe61 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/LocDetl.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/LocDetl.java
@@ -98,6 +98,7 @@
* 鎵瑰彿
*/
@ApiModelProperty(value= "鎵瑰彿")
+ @TableId(value = "batch", type = IdType.INPUT)
private String batch;
/**
diff --git a/src/main/java/zy/cloud/wms/manager/entity/ReceiveDetl.java b/src/main/java/zy/cloud/wms/manager/entity/ReceiveDetl.java
index 3c6fcbe..01777ee 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/ReceiveDetl.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/ReceiveDetl.java
@@ -267,7 +267,7 @@
if (this.inQty == 0){
return "鏈叆搴�";
}
- if (count - inQty != 0){
+ if (anfme - inQty != 0){
return "鍏ュ簱涓�";
}
return "宸插畬鎴�";
diff --git a/src/main/java/zy/cloud/wms/manager/entity/dto/PutShelfDTO.java b/src/main/java/zy/cloud/wms/manager/entity/dto/PutShelfDTO.java
new file mode 100644
index 0000000..536754d
--- /dev/null
+++ b/src/main/java/zy/cloud/wms/manager/entity/dto/PutShelfDTO.java
@@ -0,0 +1,15 @@
+package zy.cloud.wms.manager.entity.dto;
+
+import lombok.Data;
+
+@Data
+public class PutShelfDTO {
+ private String id;
+ private String anfme;
+ private String inQty;
+ private String maktx;
+ private String matnr;
+ private String remain;
+ private String select;
+ private String batch;
+}
diff --git a/src/main/webapp/static/js/receiveDetl/receiveDetl.js b/src/main/webapp/static/js/receiveDetl/receiveDetl.js
index c874679..824c40c 100644
--- a/src/main/webapp/static/js/receiveDetl/receiveDetl.js
+++ b/src/main/webapp/static/js/receiveDetl/receiveDetl.js
@@ -25,12 +25,12 @@
{type: 'checkbox'}
,{field: 'id', align: 'center',title: 'ID', hide:true}
,{field: 'hostId', align: 'center',title: '', hide:true}
- ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿'}
,{field: 'orderId$', align: 'center',title: '璁㈠崟鍐呯爜', width: 100}
- ,{field: 'anfme', align: 'center',title: '寰呬笂鏋舵暟閲�', width: 100}
- ,{field: 'inQty', align: 'center',title: '宸蹭笂鏋舵暟閲�', width: 100}
+ ,{field: 'anfme', align: 'center',title: '搴斿叆搴撻噺', width: 100}
+ ,{field: 'inQty', align: 'center',title: '宸插叆搴撻噺', width: 100}
,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜'}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'}
+ ,{field: 'state$', align: 'center',title: '璁㈠崟鐘舵��'}
,{field: 'name', align: 'center',title: '鍚嶇О', hide:true}
,{field: 'specs', align: 'center',title: '瑙勬牸', hide:true}
,{field: 'model', align: 'center',title: '鍨嬪彿', hide:true}
@@ -55,6 +55,7 @@
pageSize: 'limit'
},
parseData: function (res) {
+ console.log(res)
return {
'code': res.code,
'msg': res.msg,
@@ -194,6 +195,7 @@
}
});
function startIn(data) {
+
admin.open({
type:1
,area: '600px'
@@ -207,14 +209,27 @@
form.val('inDetail',data);
form.on('submit(inLoc)',function (data) {
+
var loc = insXmSel.getValue('valueStr');
- alert(loc);
- console.log(data);
+ // alert(loc);
+ console.log(data.field);
$.ajax({
url: baseUrl+"/receiveDetl/addIn"
,headers: {'token':localStorage.getItem('token')}
- ,data: data
+ // ,data: data.field
+ ,data: JSON.stringify(data.field)
+ ,contentType:'application/json;charset=UTF-8'
,method: 'POST'
+ ,success: function (res) {
+ console.log(res)
+ layer.closeAll();
+ if(res.code === 200){
+ layer.msg(res.msg);
+ }
+ if (res.code === 500){
+ layer.msg(res.msg);
+ }
+ }
})
return false;
});
diff --git a/src/main/webapp/views/receiveDetl/receiveDetl.html b/src/main/webapp/views/receiveDetl/receiveDetl.html
index 74f30e1..9b65ff6 100644
--- a/src/main/webapp/views/receiveDetl/receiveDetl.html
+++ b/src/main/webapp/views/receiveDetl/receiveDetl.html
@@ -61,6 +61,14 @@
<div class="layui-row">
<div class="layui-col-md6">
<div class="layui-form-item">
+ <label class="layui-form-label" >鍞竴ID: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="id" placeholder="璇疯緭鍏�" disabled>
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-md6">
+ <div class="layui-form-item">
<label class="layui-form-label" >鍟嗗搧鍚嶇О: </label>
<div class="layui-input-block">
<input class="layui-input" name="maktx" placeholder="璇疯緭鍏�" disabled>
@@ -80,7 +88,7 @@
<div class="layui-col-md6">
<div class="layui-form-item">
<label class="layui-form-label">
- 搴斿叆鏁伴噺:
+ 搴斿叆搴撻噺:
</label>
<div class="layui-input-block">
<input class="layui-input" name="anfme" disabled>
@@ -90,7 +98,7 @@
<div class="layui-col-md6">
<div class="layui-form-item">
<label class="layui-form-label">
- 宸插叆鏁伴噺:
+ 宸插叆搴撻噺:
</label>
<div class="layui-input-block">
<input class="layui-input" name="inQty" disabled>
@@ -103,7 +111,7 @@
鏈鍏ュ簱閲�:
</label>
<div class="layui-input-block">
- <input type="number" class="layui-input" name="remain" placeholder="璇疯緭鍏�">
+ <input type="number" class="layui-input" name="remain" placeholder="璇疯緭鍏�" required>
</div>
</div>
</div>
@@ -118,6 +126,16 @@
</div>
</div>
</div>
+ <div class="layui-col-md6">
+ <div class="layui-form-item">
+ <label class="layui-form-label">
+ 鎵瑰彿:
+ </label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="batch" placeholder="璇疯緭鍏�" required>
+ </div>
+ </div>
+ </div>
<hr class="layui-bg-gray">
<div class="layui-form-item text-right">
<!-- <button class="layui-btn" lay-filter="recommendIn" lay-submit="">鑷姩鍏ュ簱</button>-->
--
Gitblit v1.9.1