From 4c51dcc99e41edfb4fdc198aa740fa52d29bf641 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 11 九月 2024 16:26:23 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 81 ++++++++++++++++++++++++++++++++--------
1 files changed, 65 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 5d8970a..6ce0ea6 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -20,6 +20,7 @@
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.Date;
import java.util.List;
@@ -48,6 +49,8 @@
private TagService tagService;
@Autowired
private TagMapper tagMapper;
+ @Autowired
+ private WrkMastService wrkMastService;
@Override
@Transactional
@@ -62,30 +65,30 @@
order = new Order(
String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
param.getOrderNo(), // 璁㈠崟缂栧彿
- DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
+ param.getInboundDate(), // 鍗曟嵁鏃ユ湡
docType.getDocId(), // 鍗曟嵁绫诲瀷
null, // 椤圭洰缂栧彿
- null, //
+ param.getWarehouse(), //浠撳簱 itemName
null, // 璋冩嫧椤圭洰缂栧彿
- null, // 鍒濆绁ㄦ嵁鍙�
- null, // 绁ㄦ嵁鍙�
+ param.getOriginWarehouse(), // 鍒濆绁ㄦ嵁鍙� 鏉ユ簮浠撳簱
+ param.getDepartment(), // 绁ㄦ嵁鍙�
null, // 瀹㈡埛缂栧彿
- null, // 瀹㈡埛
+ param.getSuppliers(), // 渚涘簲鍟� cstmrName
null, // 鑱旂郴鏂瑰紡
- null, // 鎿嶄綔浜哄憳
+ param.getUser(), // 鍒跺崟浜�
null, // 鍚堣閲戦
null, // 浼樻儬鐜�
null, // 浼樻儬閲戦
null, // 閿�鍞垨閲囪喘璐圭敤鍚堣
null, // 瀹炰粯閲戦
null, // 浠樻绫诲瀷
- null, // 涓氬姟鍛�
+ param.getSalesman(), // 涓氬姟鍛�
null, // 缁撶畻澶╂暟
null, // 閭垂鏀粯绫诲瀷
null, // 閭垂
null, // 浠樻鏃堕棿
null, // 鍙戣揣鏃堕棿
- null, // 鐗╂祦鍚嶇О
+ param.getBusinessType(), // 鐗╂祦鍚嶇О
null, // 鐗╂祦鍗曞彿
1L, // 璁㈠崟鐘舵��
1, // 鐘舵��
@@ -128,6 +131,9 @@
orderDetl.setUpdateTime(now);
orderDetl.setStatus(1);
orderDetl.setQty(0.0D);
+ orderDetl.setThreeCode(detlDto.getOrderNo());
+ orderDetl.setSuppCode(detlDto.getFromOrderNo());
+ orderDetl.setMemo(detlDto.getMemo());
if (!orderDetlService.insert(orderDetl)) {
throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
@@ -197,30 +203,30 @@
order = new Order(
String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
param.getOrderNo(), // 璁㈠崟缂栧彿
- DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
+ param.getInboundDate(), // 鍗曟嵁鏃ユ湡
docType.getDocId(), // 鍗曟嵁绫诲瀷
null, // 椤圭洰缂栧彿
- null, //
+ param.getWarehouse(), //浠撳簱 itemName
null, // 璋冩嫧椤圭洰缂栧彿
- null, // 鍒濆绁ㄦ嵁鍙�
- null, // 绁ㄦ嵁鍙�
+ param.getOriginWarehouse(), // 鍒濆绁ㄦ嵁鍙� 鏉ユ簮浠撳簱
+ param.getDepartment(), // 绁ㄦ嵁鍙�
null, // 瀹㈡埛缂栧彿
- null, // 瀹㈡埛
+ param.getSuppliers(), // 渚涘簲鍟� cstmrName
null, // 鑱旂郴鏂瑰紡
- null, // 鎿嶄綔浜哄憳
+ param.getUser(), // 鍒跺崟浜�
null, // 鍚堣閲戦
null, // 浼樻儬鐜�
null, // 浼樻儬閲戦
null, // 閿�鍞垨閲囪喘璐圭敤鍚堣
null, // 瀹炰粯閲戦
null, // 浠樻绫诲瀷
- null, // 涓氬姟鍛�
+ param.getSalesman(), // 涓氬姟鍛�
null, // 缁撶畻澶╂暟
null, // 閭垂鏀粯绫诲瀷
null, // 閭垂
null, // 浠樻鏃堕棿
null, // 鍙戣揣鏃堕棿
- null, // 鐗╂祦鍚嶇О
+ param.getBusinessType(), // 鐗╂祦鍚嶇О
null, // 鐗╂祦鍗曞彿
1L, // 璁㈠崟鐘舵��
1, // 鐘舵��
@@ -263,6 +269,9 @@
orderDetl.setUpdateTime(now);
orderDetl.setStatus(1);
orderDetl.setQty(0.0D);
+ orderDetl.setThreeCode(detlDto.getOrderNo());
+ orderDetl.setSuppCode(detlDto.getFromOrderNo());
+ orderDetl.setMemo(detlDto.getMemo());
if (!orderDetlService.insert(orderDetl)) {
throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
@@ -544,4 +553,44 @@
}
+
+ @Override
+ public List<LocDetlByTimeDTO> selectTimeLocDetl(TimeSelectParam param) {
+ ArrayList<LocDetlByTimeDTO> locDetlByTimeDTOS = new ArrayList<>();
+ EntityWrapper<LocDetl> locDetlEntityWrapper = new EntityWrapper<>();
+ locDetlEntityWrapper.ge("create_time",param.getStartTime());
+ locDetlEntityWrapper.le("create_time",param.getEndTime());
+ List<LocDetl> locDetls = locDetlService.selectList(locDetlEntityWrapper);
+ if (!Cools.isEmpty(locDetls)) {
+ for (LocDetl locDetl : locDetls) {
+ LocDetlByTimeDTO locDetlByTimeDTO = new LocDetlByTimeDTO();
+ if (!Cools.isEmpty(locDetl.getOrderNo())){
+ Order order = orderService.selectByNo(locDetl.getOrderNo());
+ if (!Cools.isEmpty(order)) {
+ locDetlByTimeDTO.setDate(order.getOrderTime());
+ locDetlByTimeDTO.setWarehouse(order.getItemName());
+ locDetlByTimeDTO.setOrderType(order.getDocType().toString());
+ }
+ }
+
+ locDetlByTimeDTO.setMatnr(locDetl.getMatnr());
+ locDetlByTimeDTO.setLocNo(locDetl.getLocNo());
+ locDetlByTimeDTO.setBatch(locDetl.getBatch());
+ locDetlByTimeDTO.setAnfme(locDetl.getAnfme());
+ locDetlByTimeDTO.setOrderNo(locDetl.getOrderNo());
+ locDetlByTimeDTOS.add(locDetlByTimeDTO);
+ }
+ }
+ return locDetlByTimeDTOS;
+ }
+
+ @Override
+ @Transactional
+ public boolean agvHaiKang(String wrkNo) {
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", Long.parseLong(wrkNo)));
+ wrkMast.setWrkSts(wrkMast.getWrkStsComplete());
+ wrkMastService.updateById(wrkMast);
+ return true;
+ }
+
}
--
Gitblit v1.9.1