From 836b1f5640448ab3b2f5fd0a3a16e01d18b294b5 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 28 十二月 2023 15:41:18 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java |   24 +++++++++++++-----------
 1 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 3d2dee6..ea59cc7 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -90,7 +90,7 @@
         // 妫�绱㈠簱浣�
         LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
         List<String> matnrs = param.getList().stream().map(FullStoreParam.MatCodeStore::getMatnr).distinct().collect(Collectors.toList());
-        StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 1, param.getDevpNo(), matnrs, locTypeDto, 0);
+        StartupDto dto = commonService.getLocNo(1, 1, null, null,null,null,0, locTypeDto,0);
         // 鐢熸垚宸ヤ綔鍙�
         int workNo = dto.getWorkNo();
         // 鐢熸垚宸ヤ綔妗�
@@ -374,7 +374,7 @@
         BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
         // 妫�绱㈠簱浣�
         LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
-        StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 10, devpNo, null, locTypeDto, 0);
+        StartupDto dto = commonService.getLocNo(1, 10, devpNo, null,null,null,0, locTypeDto,0);
         int workNo = dto.getWorkNo();
         Date now = new Date();
         // 鐢熸垚宸ヤ綔妗�
@@ -490,9 +490,6 @@
     @Transactional
     public WrkMast emptyPlateOut(EmptyPlateOutParam param) {
         WrkMast wrkMast = new WrkMast();
-        if (Cools.isEmpty(param.getOutSite())) {
-            throw new CoolException("绔欑偣涓嶅瓨鍦�");
-        }
         for (String locNo : param.getLocNos()) {
             // 鑾峰彇宸ヤ綔鍙�
             int workNo = commonService.getWorkNo(0);
@@ -504,7 +501,6 @@
             // 鑾峰彇婧愮珯
             Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
                     .eq("type_no", 110)
-                    .eq("stn_no", param.getOutSite())
                     .eq("crn_no", locMast.getCrnNo());
             StaDesc staDesc = staDescService.selectOne(wrapper);
             Integer sourceStaNo = staDesc.getCrnStn();
@@ -520,7 +516,7 @@
             wrkMast.setIoType(110); // 鍏ュ嚭搴撶姸鎬侊細 110.绌烘澘鍑哄簱
             wrkMast.setIoPri(10D);
             wrkMast.setSourceStaNo(sourceStaNo); // 婧愮珯
-            wrkMast.setStaNo(param.getOutSite()); // 鐩爣绔�
+            wrkMast.setStaNo(1007); // 鐩爣绔�
             wrkMast.setCrnNo(locMast.getCrnNo());
             wrkMast.setSourceLocNo(locNo); // 婧愬簱浣�
             wrkMast.setFullPlt("N"); // 婊℃澘锛歒
@@ -624,6 +620,8 @@
             wrkDetl.setAppeUser(userId);
             wrkDetl.setModiTime(now);
             wrkDetl.setModiUser(userId);
+            wrkDetl.setOwner(locDetl.getOwner());
+            wrkDetl.setPayment(locDetl.getPayment());
             if (!wrkDetlService.insert(wrkDetl)) {
                 throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
             }
@@ -1043,14 +1041,14 @@
                 Integer deepRow = Utils.getDeepRow(slaveProperties, curRow);
                 targetLoc = locMastService.queryFreeLocMast(deepRow, locMast.getLocType1());
                 // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
-                if (!locMastService.checkEmptyCount(targetLoc)) {
+                if (!locMastService.checkEmptyCount(targetLoc,10)) {
                     continue;
                 }
             }
             if (Cools.isEmpty(targetLoc)) {
                 targetLoc = locMastService.queryFreeLocMast(curRow, locMast.getLocType1());
                 // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
-                if (!locMastService.checkEmptyCount(targetLoc)) {
+                if (!locMastService.checkEmptyCount(targetLoc,10)) {
                     continue;
                 }
                 // 鐩爣搴撲綅 ===>> 娴呭簱浣嶏紝 鍒欐牎楠屽叾娣卞簱浣嶆槸鍚︿负 F D X
@@ -1186,6 +1184,10 @@
     @Override
     @Transactional
     public void turnOverOutPayment(EmptyPlateOutParam param, Long userId) {
+        if (Cools.isEmpty(param.getPayment())){
+            throw new CoolException("璇烽�夋嫨鐩爣璐х墿褰㈡��");
+        }
+        log.info("鏇存柊璐х墿褰㈡�侊細鐩爣璐х墿褰㈡�侊細"+param.getPayment$(param.getPayment())+";鏇存敼璐х墿淇℃伅锛�"+param.getLocDetls());
         try {
             if (param.getLocDetls().size()<=0){
                 throw new CoolException("璇锋彁鍙栨槑缁�");
@@ -1206,7 +1208,7 @@
                 if (locNo1[1].equals("骞冲簱")){
                     List<ManLocDetl> manLocDetls = manLocDetlService.selectList(new EntityWrapper<ManLocDetl>().eq("loc_no", locNo));
                     for (ManLocDetl manLocDetl:manLocDetls){
-                        manLocDetl.setPayment(1);
+                        manLocDetl.setPayment(param.getPayment());
                         try{
                             manLocDetlService.update(manLocDetl,new EntityWrapper<ManLocDetl>().eq("loc_no", locNo).eq("matnr",manLocDetl.getMatnr()));
                         }catch (Exception e){
@@ -1216,7 +1218,7 @@
                 }else if (locNo1[1].equals("绔嬪簱")){
                     List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", locNo));
                     for (LocDetl locDetl:locDetls){
-                        locDetl.setPayment(1);
+                        locDetl.setPayment(param.getPayment());
                         try{
                             locDetlService.update(locDetl,new EntityWrapper<LocDetl>().eq("loc_no", locNo).eq("matnr",locDetl.getMatnr()));
                         }catch (Exception e){

--
Gitblit v1.9.1