From cb7fe9b2619ea3848489fce5004c87bbd9f71e63 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期四, 26 十二月 2024 15:55:55 +0800
Subject: [PATCH] #灌装线出库接口
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 7 +++
src/main/java/com/zy/asrs/service/LocDetlService.java | 1
src/main/resources/mapper/LocMastMapper.xml | 10 +++++
src/main/java/com/zy/asrs/mapper/LocMastMapper.java | 2 +
src/main/resources/mapper/WrkMastMapper.xml | 2
src/main/java/com/zy/common/web/WcsController.java | 78 +++++++++++++++++++++++++++++++++++++++
src/main/java/com/zy/asrs/service/LocMastService.java | 2 +
7 files changed, 101 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
index 769a90d..670c0e0 100644
--- a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
@@ -40,4 +40,6 @@
List<LocMast> selectAreaEmpty(Short locType1,Integer crnNo);
List<LocMast> selectAllLocNotEmpty(@Param("groupLoc") List<String> groupOuterLoc);
+
+ LocMast getLocFByMatnr(String locNo);
}
diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
index 1070041..aae59de 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -89,4 +89,5 @@
List<LocDetlAll> selectOwnerAllAnfme();
List<String> getSameDetl(String matnr, String batch, String grade);
+
}
diff --git a/src/main/java/com/zy/asrs/service/LocMastService.java b/src/main/java/com/zy/asrs/service/LocMastService.java
index 17d7af3..e3a6c64 100644
--- a/src/main/java/com/zy/asrs/service/LocMastService.java
+++ b/src/main/java/com/zy/asrs/service/LocMastService.java
@@ -57,4 +57,6 @@
List<LocMast> selectAreaEmpty(Short locType1, Integer crnNo);
boolean checkAllLocEmpty(List<String> groupLoc);
+
+ LocMast getLocFByMatnr(String matnr);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
index 6d6b86b..f2b6e39 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -121,4 +121,11 @@
return result.size() <= 0;
}
+ @Override
+ public LocMast getLocFByMatnr(String matnr) {
+ return this.baseMapper.getLocFByMatnr(matnr);
+ }
+
+
+
}
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 3def9f9..da45692 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -10,8 +10,10 @@
import com.zy.asrs.service.*;
import com.zy.asrs.utils.Utils;
import com.zy.common.CodeRes;
+import com.zy.common.model.LocDto;
import com.zy.common.model.LocTypeDto;
import com.zy.common.model.StartupDto;
+import com.zy.common.model.enums.WorkNoType;
import com.zy.common.service.CommonService;
import com.zy.common.web.param.SearchLocParam;
import lombok.extern.slf4j.Slf4j;
@@ -52,6 +54,8 @@
private WorkService workService;
@Autowired
private BasCrnpService basCrnpService;
+ @Autowired
+ private StaDescService staDescService;
@PostMapping("/pakin/loc/v1")
@ResponseBody
@@ -342,4 +346,78 @@
return dto;
}
+ @PostMapping("/process/loc/v1")
+ @ResponseBody
+ @Transactional
+ public synchronized void processLoc() {
+ log.info("鏀跺埌WCS缃愯鍑哄簱鎺ュ彛璇锋眰");
+ Date now = new Date();
+ // 鏌ヨ搴撳瓨鐘舵�佷綅F 涓� 搴撳瓨鏄庣粏鍖呭惈璇ョ墿鏂欑殑搴撲綅
+ LocMast tarLoc = locMastService.getLocFByMatnr("BC20009TY13701530");
+ if (Cools.isEmpty(tarLoc)) {
+ throw new CoolException("娌℃湁鍙嚭搴撶殑搴撲綅");
+ }
+ List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("io_type", 105).ne("wrk_sts", 14));
+ if (!Cools.isEmpty(tarLoc)) {
+ if (wrkMasts.size() > 3) {
+ throw new CoolException("褰撳墠宸叉湁4绗斿嚭搴撲换鍔★紝鏆傚仠涓嬪彂");
+ }
+ }
+ // 鑾峰彇婧愮珯
+ StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
+ .eq("type_no", 105)
+ .eq("stn_no", 2301)
+ .eq("crn_no", tarLoc.getCrnNo()));
+ Integer sourceStaNo = staDesc.getCrnStn();
+ // 鐢熸垚宸ヤ綔鍙�
+ int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(103));
+ // 鐢熸垚宸ヤ綔妗�
+ WrkMast wrkMast = new WrkMast();
+ wrkMast.setWrkNo(workNo);
+ wrkMast.setIoTime(now);
+ wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
+ wrkMast.setIoType(105); // 鍏ュ嚭搴撶姸鎬�
+ wrkMast.setIoPri(13D); // 浼樺厛绾э細13
+ wrkMast.setCrnNo(tarLoc.getCrnNo());
+ wrkMast.setSourceStaNo(sourceStaNo); // 婧愮珯
+ wrkMast.setStaNo(2301); // 鐩爣绔�
+ wrkMast.setSourceLocNo(tarLoc.getLocNo()); // 婧愬簱浣�
+ wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
+ wrkMast.setPicking("N"); // 鎷ｆ枡
+ wrkMast.setExitMk("N"); // 閫�鍑�
+ wrkMast.setEmptyMk("N"); // 绌烘澘
+ wrkMast.setLinkMis("N");
+ wrkMast.setBarcode(tarLoc.getBarcode());
+ wrkMast.setAppeTime(now);
+ wrkMast.setModiTime(now);
+ if (!wrkMastService.insert(wrkMast)) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐ワ紝鍑哄簱搴撲綅鍙凤細"+tarLoc.getLocNo());
+ }
+ // 鐢熸垚宸ヤ綔妗ｆ槑缁�
+ List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", tarLoc.getLocNo()));
+ for (LocDetl locDetl : locDetls) {
+ WrkDetl wrkDetl = new WrkDetl();
+ wrkDetl.sync(locDetl);
+ wrkDetl.setZpallet(wrkMast.getBarcode());
+ wrkDetl.setIoTime(now);
+ wrkDetl.setWrkNo(workNo);
+ wrkDetl.setBatch(locDetl.getBatch());
+ wrkDetl.setAnfme(locDetl.getAnfme()); // 鏁伴噺
+ wrkDetl.setAppeTime(now);
+ wrkDetl.setModiTime(now);
+ if (!wrkDetlService.insert(wrkDetl)) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
+ }
+ }
+ // 淇敼搴撲綅鐘舵��: F.鍦ㄥ簱 ====>>> R.鍑哄簱棰勭害/P.鎷ｆ枡/鐩樼偣/骞舵澘鍑哄簱涓�
+ if (tarLoc.getLocSts().equals("F")) {
+ tarLoc.setLocSts("P");
+ tarLoc.setModiTime(now);
+ if (!locMastService.updateById(tarLoc)) {
+ throw new CoolException("棰勭害搴撲綅鐘舵�佸け璐ワ紝搴撲綅鍙凤細"+tarLoc.getLocNo());
+ }
+ } else {
+ throw new CoolException(tarLoc.getLocNo() + "搴撲綅涓嶆槸鍦ㄥ簱鐘舵��");
+ }
+ }
}
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index 51a64f3..0225960 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -117,5 +117,15 @@
</foreach>
</select>
+ <select id="getLocFByMatnr" resultMap="BaseResultMap">
+ SELECT TOP 1 mast.*
+ FROM asr_loc_mast mast
+ JOIN asr_loc_detl detl
+ ON mast.loc_no = detl.loc_no
+ AND mast.loc_sts = 'F'
+ AND detl.matnr = #{matnr}
+ ORDER BY mast.modi_time
+ </select>
+
</mapper>
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index cba6ab8..c71dc34 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -63,7 +63,7 @@
</resultMap>
<select id="selectToBeCompleteData" resultMap="BaseResultMap">
- select * from asr_wrk_mast where ((wrk_sts = 4 Or wrk_sts = 14 ) and io_type != 103 and io_type != 104 and io_type != 107 ) or (wrk_sts = 2 and io_type=6) order by upd_mk,error_time,io_time,wrk_no
+ select * from asr_wrk_mast where ((wrk_sts = 4 Or wrk_sts = 14 ) and io_type != 103 and io_type != 104 and io_type != 105 and io_type != 107 ) or (wrk_sts = 2 and io_type=6) order by upd_mk,error_time,io_time,wrk_no
</select>
<select id="selectToBeHistoryData" resultMap="BaseResultMap">
--
Gitblit v1.9.1