From 49efb3fdd4857079eb3f1b5dbe54688e19ce45a4 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 13 四月 2021 11:19:24 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java | 93 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 70 insertions(+), 23 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 df67520..96a73ef 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
@@ -2,10 +2,10 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
-import com.core.common.DateUtils;
import com.core.common.R;
import com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -25,6 +25,7 @@
/**
* Created by vincent on 2021/2/25
*/
+@Slf4j
@Service("workService")
public class WorkServiceImpl implements WorkService {
@@ -48,6 +49,14 @@
private ErpService erpService;
@Autowired
private CheckService checkService;
+ @Autowired
+ private OrderService orderService;
+ @Autowired
+ private OrderDetlService orderDetlService;
+ @Autowired
+ private ItemService itemService;
+ @Autowired
+ private CstmrService cstmrService;
@Override
@Transactional
@@ -470,37 +479,75 @@
@Override
@Transactional
public R initOrder(InitOrderParam param, Long userId) {
- if (custOrderService.selectCount(new EntityWrapper<CustOrder>().eq("number", param.getNumber()).ne("bType_id", param.getCustomerTypeId())) > 0) {
+ Order order = orderService.selectByOrderNo(param.getOrderNo());
+ if (order != null) {
return R.error("鎶辨瓑鍗曞彿宸插瓨鍦紝璇蜂慨鏀瑰崟鍙�");
}
Date now = new Date();
- for (PakinMatDto dto : param.getList()){
+ Item item = itemService.selectByName(param.getItem());
+ Cstmr cstmr = cstmrService.selectByName(param.getCstmr());
+ // 鏂板璁㈠崟琛ㄥご
+ order = new Order(
+ 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, // 鐗╂祦鍗曞彿
+ null, // 璁㈠崟鐘舵��
+ 1, // 鐘舵��
+ userId, // 娣诲姞浜哄憳
+ now, // 娣诲姞鏃堕棿
+ userId, // 淇敼浜哄憳
+ now, // 淇敼鏃堕棿
+ null // 澶囨敞
+ );
+ Integer orderId = orderService.insertReturnId(order);
+ if (orderId == 0) {
+ throw new CoolException("淇濆瓨璁㈠崟琛ㄥご澶辫触锛�");
+ }
+ // 閬嶅巻鍟嗗搧鏁伴噺骞朵繚瀛�
+ for (MatnrDto dto : param.getList()){
Mat mat = matService.selectByMatnr(dto.getMatnr());
if (mat == null) {
+ log.error("{}鍟嗗搧涓嶅瓨鍦ㄣ��", dto.getMatnr());
continue;
}
- CustOrder custOrder = new CustOrder(
- param.getNumber(), // 閿�鍞崟鍙�
- DateUtils.convert(now), // 鍗曟嵁鏃ユ湡[闈炵┖]
- param.getCustomerTypeId(), // 瀹㈡埛缂栧彿
- null, // 缁忔墜浜虹紪鍙穂绌篯
- null,
- dto.getMatnr(), // 鍟嗗搧缂栧彿
- dto.getCount(), // 鍟嗗搧鏁伴噺
- dto.getCount(), // 鎬绘暟閲�
- Cools.isEmpty(mat.getName())?0.0D:Double.parseDouble(mat.getName()), // 鍟嗗搧鍗曚环
- null, // 鍟嗗搧鏄庣粏琛屽彿
- null, // 鍟嗗搧澶囨敞[绌篯
- 1, // 鐘舵��
- now, // 娣诲姞鏃堕棿
- now, // 淇敼鏃堕棿
- null // 澶囨敞
- );
- if (!custOrderService.insert(custOrder)) {
- throw new CoolException("淇濆瓨閿�鍞鍗曞け璐�");
+ OrderDetl orderDetl = new OrderDetl();
+ orderDetl.setOrderId(orderId.longValue()); // 璁㈠崟鍐呯爜
+ orderDetl.setAnfme(dto.getCount()); // 鏁伴噺
+ orderDetl.setCreateBy(userId);
+ orderDetl.setCreateTime(now);
+ orderDetl.setUpdateBy(userId);
+ orderDetl.setUpdateTime(now);
+ orderDetl.setStatus(1);
+ VersionUtils.setOrderDetl(orderDetl, mat);
+ if (!orderDetlService.insert(orderDetl)) {
+ throw new CoolException("淇濆瓨璁㈠崟鏄庣粏澶辫触");
}
}
- return R.ok("鐢熸垚閿�鍞鍗�" + param.getNumber() + "鎴愬姛");
+ return R.ok("鍒涘缓璁㈠崟鎴愬姛");
}
@Override
--
Gitblit v1.9.1