From f1d28a45d7407aeb91b05c21f47be32c9e0b959e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 10 三月 2021 14:04:37 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/entity/LocDetl.java | 6 +-
src/main/webapp/static/js/locDetl/locDetl.js | 2
src/main/webapp/views/locDetl/locDetl_detail.html | 2
src/main/webapp/static/js/comb/comb.js | 2
src/main/resources/mapper/LocDetlMapper.xml | 1
src/main/java/zy/cloud/wms/manager/controller/WorkController.java | 5 +-
src/main/java/zy/cloud/wms/common/utils/VersionUtils.java | 19 +++++++++
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java | 34 +++++++++++++++++
src/main/java/zy/cloud/wms/manager/service/WorkService.java | 5 ++
src/main/java/zy/cloud/wms/manager/entity/Comb.java | 6 +-
src/main/webapp/views/comb/comb_detail.html | 2
11 files changed, 71 insertions(+), 13 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/common/utils/VersionUtils.java b/src/main/java/zy/cloud/wms/common/utils/VersionUtils.java
index f0d0ecd..841a436 100644
--- a/src/main/java/zy/cloud/wms/common/utils/VersionUtils.java
+++ b/src/main/java/zy/cloud/wms/common/utils/VersionUtils.java
@@ -61,6 +61,25 @@
pakout.setWeight(mat.getWeight());
}
+ public static void setPakout(Pakout pakout, LocDetl locDetl) {
+ pakout.setNodeId(locDetl.getNodeId());
+ pakout.setLocNo(locDetl.getLocNo());
+ pakout.setZpallet(locDetl.getZpallet());
+ pakout.setMatnr(locDetl.getMatnr());
+ pakout.setMaktx(locDetl.getMaktx());
+ pakout.setName(locDetl.getName());
+ pakout.setSpecs(locDetl.getSpecs());
+ pakout.setModel(locDetl.getModel());
+ pakout.setBatch(locDetl.getBatch());
+ pakout.setUnit(locDetl.getUnit());
+ pakout.setBarcode(locDetl.getBarcode());
+ pakout.setCustName(locDetl.getCustName());
+ pakout.setItemNum(locDetl.getItemNum());
+ pakout.setCount(locDetl.getCount());
+ pakout.setWeight(locDetl.getWeight());
+ pakout.setDocId(locDetl.getDocId());
+ pakout.setDocNum(locDetl.getDocNum());
+ }
}
diff --git a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
index b3c3f68..19f92f9 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
@@ -96,9 +96,8 @@
@RequestMapping("/pakout/init")
@ManagerAuth(memo = "鐢熸垚鍑哄簱鍗�")
- public R initPakout(@RequestBody List<InitPakoutParam> param) {
- System.out.println(param);
- return R.ok();
+ public R initPakout(@RequestBody List<InitPakoutParam> params) {
+ return workService.initPakout(params, getUserId());
}
}
diff --git a/src/main/java/zy/cloud/wms/manager/entity/Comb.java b/src/main/java/zy/cloud/wms/manager/entity/Comb.java
index a6eec19..c8ad106 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/Comb.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/Comb.java
@@ -24,9 +24,9 @@
private String zpallet;
/**
- * 璐х墿鏁伴噺
+ * 搴撳瓨浣欓噺
*/
- @ApiModelProperty(value= "璐х墿鏁伴噺")
+ @ApiModelProperty(value= "搴撳瓨浣欓噺")
private Double anfme;
/**
@@ -194,7 +194,7 @@
// Comb comb = new Comb(
// null, // 鎵樼洏鐮�
-// null, // 璐х墿鏁伴噺
+// null, // 搴撳瓨浣欓噺
// null, // 鍟嗗搧缂栧彿[闈炵┖]
// null, // 鍟嗗搧鍚嶇О
// null, // 鍚嶇О
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 b7331cd..57b50d6 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/LocDetl.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/LocDetl.java
@@ -42,9 +42,9 @@
private String zpallet;
/**
- * 璐х墿鏁伴噺
+ * 搴撳瓨浣欓噺
*/
- @ApiModelProperty(value= "璐х墿鏁伴噺")
+ @ApiModelProperty(value= "搴撳瓨浣欓噺")
private Double anfme;
/**
@@ -207,7 +207,7 @@
// null, // 璐т綅缂栧彿[闈炵┖]
// null, // 鎵�灞炶揣浣�
// null, // 鎵樼洏鐮�
-// null, // 璐х墿鏁伴噺[闈炵┖]
+// null, // 搴撳瓨浣欓噺[闈炵┖]
// null, // 鍟嗗搧缂栧彿[闈炵┖]
// null, // 鍟嗗搧鍚嶇О
// null, // 鍚嶇О
diff --git a/src/main/java/zy/cloud/wms/manager/service/WorkService.java b/src/main/java/zy/cloud/wms/manager/service/WorkService.java
index 6229aee..0825803 100644
--- a/src/main/java/zy/cloud/wms/manager/service/WorkService.java
+++ b/src/main/java/zy/cloud/wms/manager/service/WorkService.java
@@ -1,9 +1,12 @@
package zy.cloud.wms.manager.service;
import com.core.common.R;
+import zy.cloud.wms.manager.entity.param.InitPakoutParam;
import zy.cloud.wms.manager.entity.param.StockConfirmParam;
import zy.cloud.wms.manager.entity.param.StockInParam;
import zy.cloud.wms.manager.entity.param.StockOutParam;
+
+import java.util.List;
public interface WorkService {
@@ -17,4 +20,6 @@
R stockOutComplete(StockConfirmParam param, Long userId);
+ R initPakout(List<InitPakoutParam> params, Long userId);
+
}
diff --git a/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java b/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
index b142b3d..30a8371 100644
--- a/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
+++ b/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.R;
+import com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -11,6 +12,7 @@
import zy.cloud.wms.common.service.MainService;
import zy.cloud.wms.common.utils.VersionUtils;
import zy.cloud.wms.manager.entity.*;
+import zy.cloud.wms.manager.entity.param.InitPakoutParam;
import zy.cloud.wms.manager.entity.param.StockConfirmParam;
import zy.cloud.wms.manager.entity.param.StockInParam;
import zy.cloud.wms.manager.entity.param.StockOutParam;
@@ -38,6 +40,8 @@
private CustOrderService custOrderService;
@Autowired
private PakoutService pakoutService;
+ @Autowired
+ private SnowflakeIdWorker snowflakeIdWorker;
@Override
@Transactional
@@ -129,4 +133,34 @@
return R.ok();
}
+ @Override
+ @Transactional
+ public R initPakout(List<InitPakoutParam> params, Long userId) {
+ if (!Cools.isEmpty(params)) {
+ Date now = new Date();
+ for (InitPakoutParam param : params) {
+ LocDetl locDetl = locDetlService.getLocDetl(param.getNodeId(), param.getMatnr());
+ // 淇濆瓨鍑哄簱閫氱煡鍗�
+ Pakout pakout = new Pakout();
+ pakout.setWrkSts(1L);
+ pakout.setAnfme(param.getCount());
+ pakout.setWrkNo(String.valueOf(snowflakeIdWorker.nextId()));
+ VersionUtils.setPakout(pakout, locDetl);
+ pakout.setCreateTime(now);
+ pakout.setCreateBy(userId);
+ pakout.setUpdateTime(now);
+ pakout.setUpdateBy(userId);
+ pakout.setStatus(1);
+ if (!pakoutService.insert(pakout)) {
+ throw new CoolException("鐢熸垚鎷ｈ揣鍗曞け璐�");
+ }
+ // 淇敼搴撳瓨鏄庣粏鏁伴噺
+ if (!locDetlService.reduceStock(locDetl.getNodeId(), locDetl.getMatnr(), param.getCount())) {
+ throw new CoolException("淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触");
+ }
+ }
+ }
+ return R.ok();
+ }
+
}
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index f30d2d9..6b51896 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -91,6 +91,7 @@
<update id="reduceStock">
update man_loc_detl
set anfme = anfme - #{anfme}
+ , update_time = getdate()
where 1=1
and node_id = #{nodeId}
and matnr = #{matnr}
diff --git a/src/main/webapp/static/js/comb/comb.js b/src/main/webapp/static/js/comb/comb.js
index 5b33c51..faa2595 100644
--- a/src/main/webapp/static/js/comb/comb.js
+++ b/src/main/webapp/static/js/comb/comb.js
@@ -21,7 +21,7 @@
{type: 'checkbox'}
// ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鐮�'}
- ,{field: 'anfme', align: 'center',title: '璐х墿鏁伴噺'}
+ ,{field: 'anfme', align: 'center',title: '搴撳瓨浣欓噺'}
,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿'}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'}
// ,{field: 'name', align: 'center',title: '鍚嶇О'}
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index 6ad47ee..9485ee1 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -23,7 +23,7 @@
,{field: 'locNo', align: 'center',title: '璐т綅缂栧彿'}
// ,{field: 'nodeId$', align: 'center',title: '鎵�灞炶揣浣�',event: 'nodeId', style: 'cursor:pointer'}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鐮�'}
- ,{field: 'anfme', align: 'center',title: '璐х墿鏁伴噺'}
+ ,{field: 'anfme', align: 'center',title: '搴撳瓨浣欓噺'}
,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿'}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'}
,{field: 'name', align: 'center',title: '鍚嶇О'}
diff --git a/src/main/webapp/views/comb/comb_detail.html b/src/main/webapp/views/comb/comb_detail.html
index 824a993..bf075dc 100644
--- a/src/main/webapp/views/comb/comb_detail.html
+++ b/src/main/webapp/views/comb/comb_detail.html
@@ -22,7 +22,7 @@
</div>
</div>
<div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">璐х墿鏁伴噺锛�</label>
+ <label class="layui-form-label">搴撳瓨浣欓噺锛�</label>
<div class="layui-input-inline">
<input id="anfme" class="layui-input" type="text" lay-verify="number" >
</div>
diff --git a/src/main/webapp/views/locDetl/locDetl_detail.html b/src/main/webapp/views/locDetl/locDetl_detail.html
index f018670..93f14f0 100644
--- a/src/main/webapp/views/locDetl/locDetl_detail.html
+++ b/src/main/webapp/views/locDetl/locDetl_detail.html
@@ -40,7 +40,7 @@
</div>
</div>
<div class="layui-inline" style="width:31%;">
- <label class="layui-form-label"><span class="not-null">*</span>璐х墿鏁伴噺锛�</label>
+ <label class="layui-form-label"><span class="not-null">*</span>搴撳瓨浣欓噺锛�</label>
<div class="layui-input-inline">
<input id="anfme" class="layui-input" type="text" lay-verify="required|number" >
</div>
--
Gitblit v1.9.1