From 7204baeea8ec45bf90113f7d812db30de65d1229 Mon Sep 17 00:00:00 2001
From: wang..123 <brook_w@163.com>
Date: 星期二, 22 三月 2022 18:23:10 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java | 135 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 129 insertions(+), 6 deletions(-)
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 c92e900..47c3b4e 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
@@ -60,7 +60,8 @@
private ReceiveService receiveService;
@Autowired
private ReceiveDetlService receiveDetlService;
-
+ @Autowired
+ ReceiveLogService receiveLogService;
@Override
@@ -116,6 +117,23 @@
if (!pakinService.insert(pakin)) {
throw new CoolException("淇濆瓨鍏ュ簱璁板綍澶辫触");
}
+
+ /**
+ * 涓婃灦瀹屾垚涔嬪悗,瀛樻斁鏁版嵁鑷充笂鏋剁粺璁¤〃 man_receive_log
+ */
+ ReceiveLog receiveLog = new ReceiveLog();
+ receiveLog.setOrderNo("");//鍗曞彿
+ receiveLog.setNodeId(node.getId());//搴撲綅鍙穒d
+ receiveLog.setNodeName(node.getName());//搴撲綅鍚嶇О
+ receiveLog.setMatnr(dto.getMatnr());//鐗╂枡缂栫爜
+ receiveLog.setAnfme(dto.getCount());//鏁伴噺
+ receiveLog.setBatch(dto.getBatch());//鎵瑰彿
+ receiveLog.setCreateBy(userId);//娣诲姞浜哄憳
+ receiveLog.setUpdateBy(userId);//淇敼浜哄憳
+ receiveLog.setCreateTime(now);
+ receiveLog.setUpdateTime(now);
+ receiveLog.setIoType(1);
+ receiveLogService.insert(receiveLog);
// 淇敼搴撳瓨
LocDetl locDetl = locDetlService.getLocDetl(node.getId(), dto.getMatnr());
if (locDetl == null) {
@@ -127,6 +145,7 @@
locDetl.setZpallet("");
locDetl.setAnfme(dto.getCount());
VersionUtils.setLocDetl(locDetl, mat);
+ locDetl.setBatch(dto.getBatch());
// locDetl.setDocId(param.getDocType().longValue());
// locDetl.setDocNum(docNum);
locDetl.setStatus(1);
@@ -564,13 +583,11 @@
}
return R.ok("鎷ｈ揣鍗曞凡鍙栨秷");
}
-
@Override
@Transactional
- public R initOrder(InitOrderParam param, Long userId, Long hostId) {
+ public R initReceive(InitOrderParam param, Long userId, Long hostId){
Receive order_no = receiveService.selectOne(new EntityWrapper<Receive>()
.eq("order_no", param.getOrderNo()));
-// Order order = orderService.selectByOrderNo(param.getOrderNo(), hostId);
if (order_no != null) {
return R.error("鎶辨瓑鍗曞彿宸插瓨鍦紝璇蜂慨鏀瑰崟鍙�");
}
@@ -615,10 +632,116 @@
now, // 淇敼鏃堕棿
null // 澶囨敞
);
+ if (!receiveService.insert(order_no)) {
+ throw new CoolException("淇濆瓨璁㈠崟琛ㄥご澶辫触锛�");
+ }
+
+ // 閬嶅巻鍟嗗搧鏁伴噺骞朵繚瀛�
+ for (MatnrDto dto : param.getList()){
+ Mat mat = matService.selectByMatnr(hostId, dto.getMatnr());
+ if (mat == null) {
+ log.error("{}鍟嗗搧涓嶅瓨鍦ㄣ��", dto.getMatnr());
+ continue;
+ }
+ ReceiveDetl receiveDetl = new ReceiveDetl();
+ receiveDetl.setHostId(hostId);
+ receiveDetl.setOrderId(order_no.getId());
+ receiveDetl.setOrderNo(param.getOrderNo());
+ receiveDetl.setAnfme(dto.getCount());
+ receiveDetl.setCreateTime(now);
+ receiveDetl.setCreateBy(userId);
+ receiveDetl.setUpdateBy(userId);
+ receiveDetl.setUpdateTime(now);
+ receiveDetl.setStatus(1);
+ receiveDetl.setMatnr(mat.getMatnr());
+ receiveDetl.setMaktx(mat.getMaktx());
+ receiveDetl.setName(mat.getName());
+ receiveDetl.setSpecs(mat.getSpecs());
+ receiveDetl.setModel(mat.getModel());
+ receiveDetl.setBatch(mat.getBatch());
+ receiveDetl.setUnit(mat.getUnit());
+ receiveDetl.setBarcode(mat.getBarcode());
+ receiveDetl.setItemNum(mat.getItemNum());
+ receiveDetl.setCount(dto.getCount());
+ receiveDetl.setUnitPrice(mat.getPrice());
+ receiveDetl.setWeight(mat.getWeight());
+ if (!receiveDetlService.insert(receiveDetl)) {
+ throw new CoolException("淇濆瓨璁㈠崟鏄庣粏澶辫触");
+ }
+ }
+ return R.ok("鍒涘缓璁㈠崟鎴愬姛");
+ }
+
+ @Override
+ @Transactional
+ public R initOrder(InitOrderParam param, Long userId, Long hostId) {
+ // Receive order_no = receiveService.selectOne(new EntityWrapper<Receive>()
+ // .eq("order_no", param.getOrderNo()));
+ Order order = orderService.selectByOrderNo(param.getOrderNo(), hostId);
+ if (order != null) {
+ return R.error("鎶辨瓑鍗曞彿宸插瓨鍦紝璇蜂慨鏀瑰崟鍙�");
+ }
+ Date now = new Date();
+ Item item = itemService.selectByName(param.getItem());
+ Cstmr cstmr = cstmrService.selectByName(param.getCstmr());
+ // 鏂板璁㈠崟琛ㄥご
+ Order order1 = new Order();
+ order1.setUuid(String.valueOf(snowflakeIdWorker.nextId()));
+ order1.setHostId(hostId);
+ order1.setOrderNo(param.getOrderNo());
+ order1.setOrderTime(param.getOrderTime());
+ order1.setDocType(param.getDocType());
+ order1.setItemId(item.getId());
+ order1.setItemName(param.getItem());
+ order1.setCstmr(cstmr.getId());
+ order1.setCstmrName(param.getCstmr());
+ order1.setSettle(1L);
+ order1.setStatus(1);
+ order1.setCreateBy(userId);
+ order1.setCreateTime(now);
+ order1.setUpdateBy(userId);
+ order1.setUpdateTime(now);
+// order_no = new Receive(
+// hostId,
+// String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
+// param.getOrderNo(), // 璁㈠崟缂栧彿
+// param.getOrderTime(), // 鍗曟嵁鏃ユ湡
+// param.getDocType(), // 鍗曟嵁绫诲瀷
+// item==null?null:item.getId(), // 椤圭洰缂栧彿
+// param.getItem(), // 椤圭洰鍚嶇О
+// null, // 璋冩嫧椤圭洰缂栧彿
+// null, // 鍒濆绁ㄦ嵁鍙�
+// null, // 绁ㄦ嵁鍙�
+// cstmr==null?null:cstmr.getId(), // 瀹㈡埛缂栧彿
+// param.getCstmr(), // 瀹㈡埛
+// null, // 鑱旂郴鏂瑰紡
+// null, // 鎿嶄綔浜哄憳
+// null, // 鍚堣閲戦
+// null, // 浼樻儬鐜�
+// null, // 浼樻儬閲戦
+// null, // 閿�鍞垨閲囪喘璐圭敤鍚堣
+// null, // 瀹炰粯閲戦
+// null, // 浠樻绫诲瀷
+// null, // 涓氬姟鍛�
+// null, // 缁撶畻澶╂暟
+// null, // 閭垂鏀粯绫诲瀷
+// null, // 閭垂
+// null, // 浠樻鏃堕棿
+// null, // 鍙戣揣鏃堕棿
+// null, // 鐗╂祦鍚嶇О
+// null, // 鐗╂祦鍗曞彿
+// 1L, // 璁㈠崟鐘舵��
+// 1, // 鐘舵��
+// userId, // 娣诲姞浜哄憳
+// now, // 娣诲姞鏃堕棿
+// userId, // 淇敼浜哄憳
+// now, // 淇敼鏃堕棿
+// null // 澶囨敞
+// );
// if (!orderService.insert(order)) {
// throw new CoolException("淇濆瓨璁㈠崟琛ㄥご澶辫触锛�");
// }
- if (!receiveService.insert(order_no)) {
+ if (!orderService.insert(order1)) {
throw new CoolException("淇濆瓨璁㈠崟琛ㄥご澶辫触锛�");
}
@@ -652,7 +775,7 @@
}
ReceiveDetl receiveDetl = new ReceiveDetl();
receiveDetl.setHostId(hostId);
- receiveDetl.setOrderId(order_no.getId());
+ receiveDetl.setOrderId(order1.getId());
receiveDetl.setAnfme(dto.getCount());
receiveDetl.setCreateTime(now);
receiveDetl.setCreateBy(userId);
--
Gitblit v1.9.1