From b075e256f65604e20c8d1f89d5f3f999d1a3dfdf Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 06 九月 2022 10:27:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zypms' into zypms
---
src/main/java/zy/cloud/wms/common/service/MainService.java | 157 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 157 insertions(+), 0 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/common/service/MainService.java b/src/main/java/zy/cloud/wms/common/service/MainService.java
index 33eda64..165c823 100644
--- a/src/main/java/zy/cloud/wms/common/service/MainService.java
+++ b/src/main/java/zy/cloud/wms/common/service/MainService.java
@@ -9,6 +9,7 @@
import org.springframework.transaction.annotation.Transactional;
import zy.cloud.wms.common.model.MatnrDto;
import zy.cloud.wms.common.model.OrderStoDto;
+import zy.cloud.wms.common.model.ReceiveStoDto;
import zy.cloud.wms.common.utils.VersionUtils;
import zy.cloud.wms.manager.entity.*;
import zy.cloud.wms.manager.service.*;
@@ -32,6 +33,10 @@
private SnowflakeIdWorker snowflakeIdWorker;
@Autowired
private OrderService orderService;
+ @Autowired
+ private ReceiveService receiveService;
+ @Autowired
+ private ReceiveDetlService receiveDetlService;
@Transactional
public List<StoPreTab> stockOutPreview(OrderStoDto orderStoDto, Long hostId) {
@@ -47,6 +52,80 @@
Mat mat = matService.selectByMatnr(hostId, matnrDto.getMatnr());
if (null == mat) {
throw new CoolException(matnrDto.getMatnr() + "鐗╂枡灏氭湭鏇存柊銆�" + orderStoDto.getOrderNo() +"鍗曟嵁鍥犳涓柇锛�");
+ }
+
+ Double sumAnfme = Optional.ofNullable(locDetlService.selectCountByMatnr(mat.getMatnr(), hostId)).orElse(0.0D);
+ double lack = 0.0D;
+ // 缂鸿揣
+ if (sumAnfme < matnrDto.getCount()) {
+ lack = matnrDto.getCount() - sumAnfme;
+ // 瑙嗗浘瀵硅薄
+ StoPreTab tab = new StoPreTab();
+ tab.setTitle(mat.getMaktx() + "锛�" + mat.getMatnr() + "锛�");
+ tab.setMatnr(mat.getMatnr());
+ tab.setMaktx(mat.getMaktx());
+ tab.setAnfme(matnrDto.getCount());
+ tab.setLocNo("缂鸿揣");
+ tab.setTotal(lack);
+ tab.setReduce(lack);
+ tab.setRemQty(0.0D);
+ tab.setPrior(false);
+ tab.setPrior$("脳");
+ tab.setType(0);
+ res.add(tab);
+ }
+
+ // 鏌ヨ瀛樻湁褰撳墠鐗╂枡鐨勮揣浣�
+ List<LocDetl> locDetls = locDetlService.findOfSort(hostId, mat.getMatnr());
+ double issued = Optional.of(matnrDto.getCount() - lack).orElse(0.0D) ;
+ double anfme = issued;
+ for (LocDetl locDetl : locDetls) {
+ if (issued > 0) {
+ // 瑙嗗浘瀵硅薄
+ StoPreTab tab = new StoPreTab();
+ tab.setTitle(mat.getMaktx() + "锛�" + mat.getMatnr() + "锛�");
+ tab.setMatnr(mat.getMatnr());
+ tab.setMaktx(mat.getMaktx());
+ tab.setAnfme(matnrDto.getCount());
+
+ tab.setLocNo(locDetl.getLocNo());
+ tab.setNodeId(locDetl.getNodeId());
+ tab.setTotal(locDetl.getAnfme());
+ tab.setReduce(issued>=locDetl.getAnfme()?locDetl.getAnfme():issued);
+ tab.setRemQty(tab.getTotal() - tab.getReduce());
+ tab.setPrior(locDetlService.isPrior(locDetl.getNodeId(), mat.getMatnr()));
+ tab.setPrior$(tab.getPrior()?"鉁�":"脳");
+ tab.setType(1);
+ res.add(tab);
+ // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
+ issued = issued - locDetl.getAnfme();
+ }
+ }
+
+ }
+ res.sort(new Comparator<StoPreTab>() {
+ @Override
+ public int compare(StoPreTab o1, StoPreTab o2) {
+// return o1.getMatnr().length() - o2.getMatnr().length();
+ return (int) (o1.getAnfme() - o2.getAnfme());
+ }
+ });
+ return res;
+ }
+ @Transactional
+ public List<StoPreTab> receiveStockOutPreview(ReceiveStoDto receiveStoDto, Long hostId) {
+ if (Cools.isEmpty(receiveStoDto) || Cools.isEmpty(receiveStoDto.getDtos())) {
+ throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
+ }
+ List<StoPreTab> res = new ArrayList<>();
+ // 妫�鏌ュ簱瀛樻槸鍚﹁冻澶�
+// locDetlService.checkLocDetlCount(orderStoDto.getDtos());
+
+ for (MatnrDto matnrDto : receiveStoDto.getDtos()) {
+ // 鍒ゆ柇鐗╂枡鏄惁瀛樺湪
+ Mat mat = matService.selectByMatnr(hostId, matnrDto.getMatnr());
+ if (null == mat) {
+ throw new CoolException(matnrDto.getMatnr() + "鐗╂枡灏氭湭鏇存柊銆�" + receiveStoDto.getOrderNo() +"鍗曟嵁鍥犳涓柇锛�");
}
Double sumAnfme = Optional.ofNullable(locDetlService.selectCountByMatnr(mat.getMatnr(), hostId)).orElse(0.0D);
@@ -171,5 +250,83 @@
}
}
}
+ @Transactional
+ public void receiveStockOutProcess(ReceiveStoDto receiveStoDto, Long hostId) {
+ if (Cools.isEmpty(receiveStoDto) || Cools.isEmpty(receiveStoDto.getDtos())) {
+ return;
+ }
+ Receive receive = receiveService.selectByOrderNo(receiveStoDto.getOrderNo(), hostId);
+// Order order = orderService.selectByOrderNo(orderStoDto.getOrderNo(), hostId);
+ if (receive == null) {
+ throw new CoolException(receiveStoDto.getOrderNo() + "鍗曟嵁涓嶅瓨鍦�");
+ }
+ Date now = new Date();
+ // 妫�鏌ュ簱瀛樻槸鍚﹁冻澶�
+ locDetlService.checkLocDetlCount(receiveStoDto.getDtos(), hostId);
+
+ for (MatnrDto matnrDto : receiveStoDto.getDtos()) {
+ // 鍒ゆ柇鐗╂枡鏄惁瀛樺湪
+ Mat mat = matService.selectByMatnr(hostId, matnrDto.getMatnr());
+ if (null == mat) {
+ throw new CoolException(matnrDto.getMatnr() + "鐗╂枡灏氭湭鏇存柊銆�" + matnrDto.getCount() +"鍗曟嵁鍥犳涓柇锛�");
+ }
+ // 鏌ヨ瀛樻湁褰撳墠鐗╂枡鐨勮揣浣�
+ List<LocDetl> locDetls = locDetlService.findOfSort(hostId, mat.getMatnr());
+ double issued = Optional.ofNullable(matnrDto.getCount()).orElse(0.0D) ;
+ for (LocDetl locDetl : locDetls) {
+ if (issued > 0) {
+ // 淇濆瓨鍑哄簱閫氱煡鍗�
+ Pakout pakout = new Pakout();
+ pakout.setHostId(hostId);
+ pakout.setWrkSts(1L);
+ pakout.setAnfme(issued>=locDetl.getAnfme()?locDetl.getAnfme():issued);
+ pakout.setZpallet(locDetl.getZpallet());
+ pakout.setLocNo(locDetl.getLocNo());
+ pakout.setNodeId(locDetl.getNodeId());
+ pakout.setWrkNo(String.valueOf(snowflakeIdWorker.nextId()));
+ VersionUtils.setPakout(pakout, mat);
+ pakout.setDocId(receive.getDocType()); // 鍗曟嵁绫诲瀷
+ pakout.setDocNum(receive.getOrderNo()); // 鍗曟嵁缂栧彿
+ pakout.setCreateTime(now);
+ pakout.setUpdateTime(now);
+ pakout.setStatus(1);
+ if (!pakoutService.insert(pakout)) {
+ throw new CoolException("淇濆瓨鍑哄簱閫氱煡鍗曞け璐�");
+ }
+ if (issued>=locDetl.getAnfme()) {
+// // 鍒犻櫎搴撳瓨鏄庣粏
+// if (!locDetlService.removeStock(locDetl.getNodeId(), mat.getMatnr())) {
+// throw new CoolException("鍒犻櫎搴撳瓨鏄庣粏澶辫触");
+// }
+ } else {
+// // 淇敼搴撳瓨鏄庣粏鏁伴噺
+// if (!locDetlService.reduceStock(locDetl.getNodeId(), mat.getMatnr(), issued)) {
+// throw new CoolException("淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触");
+// }
+ }
+ // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
+ issued = issued - locDetl.getAnfme();
+ }
+ }
+ // 淇敼鍗曟嵁鐘舵��
+ if (!orderService.updateSettle(receiveStoDto.getOrderNo(), 2L, hostId)) {
+ throw new CoolException("淇敼鍗曟嵁鐘舵�佸け璐�");
+ }
+ }
+ }
+
+ public static void main(String[] args) {
+
+ for (int i = 2; i < 51; i++) {
+ System.out.println("EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'鑺傜偣"+i+"鍚嶇О' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'man_item_detl', @level2type=N'COLUMN',@level2name=N'node"+i+"_name'\n" +
+ "GO");
+ System.out.println("EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'鑺傜偣"+i+"鎴鏃ユ湡' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'man_item_detl', @level2type=N'COLUMN',@level2name=N'node"+i+"_deadline'\n" +
+ "GO");
+ System.out.println("EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'鑺傜偣"+i+"瀹屽伐鏃ユ湡' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'man_item_detl', @level2type=N'COLUMN',@level2name=N'node"+i+"_real_deadline'\n" +
+ "GO");
+ System.out.println("EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'鑺傜偣"+i+"瓒呭嚭鏃ユ湡' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'man_item_detl', @level2type=N'COLUMN',@level2name=N'node"+i+"_extra_day'\n" +
+ "GO");
+ }
+ }
}
--
Gitblit v1.9.1