From 51d30c2d083557189aebde54b60656bf1f7bd541 Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期四, 25 一月 2024 13:51:05 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/OutboundAllocationUtil.java | 107 +++++++++++++++++++++
src/main/resources/mapper/WrkDetlMapper.xml | 7 +
src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java | 5 +
src/main/java/com/zy/asrs/service/WrkMastService.java | 2
src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java | 5 +
src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java | 6 +
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 5 +
src/main/java/com/zy/common/web/WcsController.java | 151 ++++++++++++++++++++++++++++++
src/main/java/com/zy/asrs/service/WrkDetlService.java | 2
9 files changed, 290 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java b/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java
index 61b3a57..187a8b5 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java
@@ -6,6 +6,7 @@
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
+import java.util.Date;
import java.util.List;
@Mapper
@@ -26,4 +27,8 @@
List<WrkDetl> selectPakoutQuery(@Param("staNo")Integer staNo, @Param("matnr")String matnr);
List<WrkDetl> selectAndLogByOrderNoGroupByMatnrOfSum(String orderNo);
+
+ int updateIoTimeWms(@Param("workNo") Integer workNo, @Param("ioTime") Date ioTime);
+
+
}
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
index dd349bd..47c07be 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.WrkMast;
+import org.apache.ibatis.annotations.Insert;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
@@ -16,4 +17,8 @@
List<WrkMast> selectToBeHistoryData();
+ // work log -------------------------------------------------------
+ @Insert("insert into asr_wrk_mast_log select * from asr_wrk_mast where wrk_no=#{workNo}")
+ int saveWrkMastLog(Integer workNo);
+
}
diff --git a/src/main/java/com/zy/asrs/service/WrkDetlService.java b/src/main/java/com/zy/asrs/service/WrkDetlService.java
index 6e30b7b..5bb5613 100644
--- a/src/main/java/com/zy/asrs/service/WrkDetlService.java
+++ b/src/main/java/com/zy/asrs/service/WrkDetlService.java
@@ -24,4 +24,6 @@
List<WrkDetl> selectAndLogByOrderNoGroupByMatnrOfSum(String orderNo);
+ boolean updateIoTimeWms(Integer workNo, Date ioTime);
+
}
diff --git a/src/main/java/com/zy/asrs/service/WrkMastService.java b/src/main/java/com/zy/asrs/service/WrkMastService.java
index ff9c2ba..debf331 100644
--- a/src/main/java/com/zy/asrs/service/WrkMastService.java
+++ b/src/main/java/com/zy/asrs/service/WrkMastService.java
@@ -21,4 +21,6 @@
* @return
*/
int getStoreCount(Integer crnNo);
+
+ int saveWrkMastLog(Integer workNo);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
index f40bf7f..8f413d1 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
@@ -89,4 +89,9 @@
public List<WrkDetl> selectAndLogByOrderNoGroupByMatnrOfSum(String orderNo) {
return this.baseMapper.selectAndLogByOrderNoGroupByMatnrOfSum(orderNo);
}
+
+ @Override
+ public boolean updateIoTimeWms(Integer workNo, Date ioTime) {
+ return this.baseMapper.updateIoTimeWms(workNo, ioTime) > 0;
+ }
}
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
index ab394ec..e522563 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
@@ -45,4 +45,10 @@
.last(" and (wrk_sts in (1,2) or (wrk_sts=3 and wrk_no in (select wrk_no from asr_bas_devp)))"));
}
+
+ @Override
+ public int saveWrkMastLog(Integer workNo){
+ return this.baseMapper.saveWrkMastLog(workNo);
+ };
+
}
diff --git a/src/main/java/com/zy/asrs/utils/OutboundAllocationUtil.java b/src/main/java/com/zy/asrs/utils/OutboundAllocationUtil.java
index bba7f06..3febe69 100644
--- a/src/main/java/com/zy/asrs/utils/OutboundAllocationUtil.java
+++ b/src/main/java/com/zy/asrs/utils/OutboundAllocationUtil.java
@@ -254,4 +254,111 @@
return stockOutParams;
}
+
+ public static List<StockOutParam> OutboundClassificationNew(StockOutParam param){
+ List<StockOutParam> stockOutParams = new ArrayList<>();
+
+ List<StockOutParam.LocDetl> locDetls = param.getLocDetls();
+ List<String> brands = new ArrayList<>();
+ for (StockOutParam.LocDetl locDetl:locDetls){
+ if (Cools.isEmpty(locDetl.getBrand())){
+ locDetl.setBrand("");
+ }
+ if (!brands.contains(locDetl.getBrand())){
+ brands.add(locDetl.getBrand());
+ }
+ }
+
+ for (String brand : brands){
+ List<StockOutParam.LocDetl> locDetls1 = new ArrayList<>();
+ List<StockOutParam.LocDetl> locDetls2 = new ArrayList<>();
+ List<StockOutParam.LocDetl> locDetls3 = new ArrayList<>();
+ List<StockOutParam.LocDetl> locDetls4 = new ArrayList<>();
+ List<StockOutParam.LocDetl> locDetls5 = new ArrayList<>();
+ List<StockOutParam.LocDetl> locDetls6 = new ArrayList<>();
+ for (StockOutParam.LocDetl locDetl:locDetls){
+ if (Cools.isEmpty(locDetl.getBrand())){
+ locDetl.setBrand("");
+ }
+ if (locDetl.getBrand().equals(brand)){
+ switch (Utils.getRow(locDetl.getLocNo())){
+ case 1: case 2: case 3: case 4:
+ locDetls1.add(locDetl);
+ break;
+ case 5: case 6: case 7: case 8:
+ locDetls2.add(locDetl);
+ break;
+ case 9: case 10: case 11: case 12:
+ locDetls3.add(locDetl);
+ break;
+ case 13: case 14: case 15: case 16:
+ locDetls4.add(locDetl);
+ break;
+ case 17: case 18: case 19: case 20:
+ locDetls5.add(locDetl);
+ break;
+ case 21: case 22: case 23: case 24:
+ locDetls6.add(locDetl);
+ break;
+ default:
+ }
+ }
+ }
+ ArrayList<List<StockOutParam.LocDetl>> lists = new ArrayList<>();
+ lists.add(locDetls1);
+ lists.add(locDetls2);
+ lists.add(locDetls3);
+ lists.add(locDetls4);
+ lists.add(locDetls5);
+ lists.add(locDetls6);
+
+ int sign = 0;
+ int staA=118;
+ int staB=119;
+ for (List<StockOutParam.LocDetl> locDetlList:lists){
+ sign++;
+ if (locDetlList.size()==0){
+ continue;
+ }
+ if (sign>lists.size()/2) {
+ //120銆�121
+ staA=120;
+ staB=121;
+ }
+ List<StockOutParam.LocDetl> locDetlsA = new ArrayList<>();
+ List<StockOutParam.LocDetl> locDetlsB = new ArrayList<>();
+ List<String> locNos = new ArrayList<>();
+ for (StockOutParam.LocDetl locDetl:locDetlList){
+ if (locDetlsA.size()<locDetlList.size()/2){
+ locDetlsA.add(locDetl);
+ if (!locNos.contains(locDetl.getLocNo())){
+ locNos.add(locDetl.getLocNo());
+ }
+ }else {
+ if (locNos.contains(locDetl.getLocNo())){
+ locDetlsA.add(locDetl);
+ }else {
+ locDetlsB.add(locDetl);
+ }
+ }
+ }
+ if (locDetlsA.size()!=0){
+ StockOutParam stockOutParamA = new StockOutParam();
+ stockOutParamA.setOutSite(staA);
+ stockOutParamA.setOrderNo(param.getOrderNo());
+ stockOutParamA.setLocDetls(locDetlsA);
+ stockOutParams.add(stockOutParamA);
+ }
+ if (locDetlsB.size()!=0){
+ StockOutParam stockOutParamB = new StockOutParam();
+ stockOutParamB.setOutSite(staB);
+ stockOutParamB.setOrderNo(param.getOrderNo());
+ stockOutParamB.setLocDetls(locDetlsB);
+ stockOutParams.add(stockOutParamB);
+ }
+ }
+ }
+
+ return stockOutParams;
+ }
}
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 29abee5..c2d5b17 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -51,6 +51,8 @@
private RowLastnoService rowLastnoService;
@Autowired
private WorkService workService;
+ @Autowired
+ private StaDescService staDescService;
@PostMapping("/pakin/loc/v1")
@ResponseBody
@@ -109,6 +111,155 @@
return R.ok().add(dto);
}
+ @PostMapping("/pakin2/loc/v1")
+ @ResponseBody
+ @Transactional
+ public synchronized R getLocNo2(@RequestBody SearchLocParam param) {
+ if (Cools.isEmpty(param.getIoType())) {
+ return R.error("鍏ュ嚭搴撶被鍨嬩笉鑳戒负绌�");
+ }
+ if (Cools.isEmpty(param.getSourceStaNo())) {
+ return R.error("婧愮珯缂栧彿涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(param.getBarcode())) {
+ return R.error("鏉$爜涓嶈兘涓虹┖");
+ }
+
+ // 婧愮珯鐐圭姸鎬佹娴�
+ BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), false);
+ sourceStaNo.setLocType1(param.getLocType1());
+// LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
+ LocTypeDto locTypeDto = new LocTypeDto();
+ locTypeDto.setLocType1((short)1);
+
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
+ .eq("barcode", param.getBarcode())
+ .eq("io_type", param.getIoType())
+ .eq("wrk_sts",14));
+ StartupDto dto = new StartupDto();
+
+ if (Cools.isEmpty(wrkMast)){
+ try{
+ log.info("/pakin2/loc/v1:"+dto + "======鎵樼洏鐮�:"+param.getBarcode()+"姝ょ瑪宸ヤ綔妗f湭鏌ヨ鍒扮洏鐐�/鎷f枡鍑哄簱浠诲姟锛屽紑濮嬫煡璇㈢洏鐐�/鎷f枡鍐嶅叆搴撲换鍔�==銆�");
+ WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
+ .eq("barcode", param.getBarcode())
+ .eq("io_type", param.getIoType()-50)
+ .eq("wrk_sts",2));
+ if (Cools.isEmpty(wrkMast1)){
+ return R.error("鏈煡璇㈠埌宸ヤ綔妗�===銆嬫墭鐩樼爜:"+param.getBarcode());
+ }
+ // 鑾峰彇鐩爣绔�
+ Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
+ .eq("type_no", param.getIoType()-50)
+ .eq("stn_no", sourceStaNo.getDevNo())
+ .eq("crn_no", wrkMast1.getCrnNo());
+ StaDesc staDesc = staDescService.selectOne(wrapper);
+ if (Cools.isEmpty(staDesc)) {
+ log.error("type_no={},stn_no={},crn_no={}", param.getIoType()-50, sourceStaNo, wrkMast1.getCrnNo());
+ throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
+ }
+ if (!staDesc.getCrnStn().equals(wrkMast1.getStaNo())){
+ throw new CoolException("鍫嗗灈鏈轰綔涓氱珯鐐逛笌宸ヤ綔鍙风洰鏍囩珯鐐逛笉涓�鑷达紒锛侊紒璇疯仈绯诲伐绋嬪笀淇敼"+
+ "\\n鍫嗗灈鏈哄彿锛�"+wrkMast1.getCrnNo()+
+ "\\n鍫嗗灈鏈虹珯鐐癸細"+staDesc.getCrnStn()+
+ "\\n宸ヤ綔鍙凤細"+wrkMast1.getWrkNo()+
+ "\\n宸ヤ綔妗g洰鏍囩珯鐐癸細"+wrkMast1.getStaNo());
+ }
+ dto.setWorkNo(wrkMast1.getWrkNo());
+ dto.setCrnNo(wrkMast1.getCrnNo());
+ dto.setLocNo(wrkMast1.getLocNo());
+ dto.setStaNo(wrkMast1.getStaNo());
+ dto.setSourceStaNo(wrkMast1.getSourceStaNo());
+ log.info("/pakin2/loc/v1:"+dto + "======鎵樼洏鐮�:"+param.getBarcode()+"姝ょ瑪宸ヤ綔妗e凡缁忔槸鐩樼偣鍐嶅叆搴撶姸鎬侊紝杩斿洖wcs涓嬪彂淇℃伅");
+ return R.ok().add(dto);
+ }catch (Exception e){
+ log.error("/pakin2/loc/v1:======鎵樼洏鐮�:"+param.getBarcode()+"鐩樼偣鍥炲簱鏌ヨ宸ヤ綔妗e嚭閿�======>"+e);
+ return R.error("鏌ョ湅wms==>info==>error");
+ }
+ }
+
+ List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()));
+ if (Cools.isEmpty(locDetls) || locDetls.size()<1){
+ return R.error("鎵樼洏鐮�:"+param.getBarcode()+",鏈煡鍒板簱瀛樻槑缁�");
+ }else {
+ if (!locDetls.get(0).getLocNo().equals(wrkMast.getSourceLocNo())){
+ return R.error("鏄庣粏宸茬粡琚慨鏀�,鏁呴殰");
+ }
+ }
+
+ Date now = new Date();
+ if (param.getIoType() == 107) {//鐩樼偣鍐嶅叆搴�
+ try{
+ // 妫�绱㈠簱浣�
+ try{
+ dto = commonService.getLocNo(1, 1, param.getSourceStaNo(), locDetls.get(0).getMatnr(),null,null, locTypeDto);
+ }catch (Exception e){
+ log.error("鍫嗗灈鏈虹珯鐩樼偣鍐嶅叆搴撴煡璇㈠簱浣嶅嚭閿�:"+e.getMessage()+e);
+ throw new Exception("鏌ヨ搴撲綅鍑洪敊锛屽弬鏁帮細param.getSourceStaNo():"+param.getSourceStaNo()+"==>locDetls:"+locDetls+"==>locTypeDto:"+locTypeDto);
+ }
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", dto.getLocNo()));
+ if (Cools.isEmpty(locMast) || Cools.isEmpty(locMast.getLocSts())){
+ throw new Exception("鐩爣搴撲綅locMast鏌ヨ涓虹┖||locMast.getLocSts涓虹┖");
+ }else {
+ if (!locMast.getLocSts().equals("O")){
+ throw new Exception("鐩爣搴撲綅锛乴ocMast.getLocSts.equals(鈥淥鈥�)"+locMast.getLocSts());
+ }else {
+ locMast.setLocSts("Q");
+ locMast.setBarcode(param.getBarcode());
+ if (!locMastService.updateById(locMast)) {
+ log.error(" /pakin2/loc/v1 --- 淇敼搴撲綅鐘舵�佸け璐ワ紒" + locMast.getLocNo());
+ throw new Exception("淇敼搴撲綅鐘舵�佸け璐�");
+ }
+ }
+ }
+ if (!locDetlService.updateLocNo(locMast.getLocNo(),wrkMast.getSourceLocNo())){
+ log.error(" /pakin2/loc/v1 --- 搴撳瓨鏄庣粏杞Щ澶辫触锛�" + wrkMast.getWrkNo());
+ throw new Exception("搴撳瓨鏄庣粏杞Щ澶辫触");
+ }
+ // 淇敼婧愬簱浣嶇姸鎬� O 绌哄簱浣�
+ LocMast locMast2 = locMastService.selectById(wrkMast.getSourceLocNo());
+ locMast2.setLocSts("O");
+ locMast2.setBarcode("");
+ locMast2.setModiTime(now);
+ if (!locMastService.updateById(locMast2)) {
+ log.error(" /pakin2/loc/v1 --- 淇敼婧愬簱浣嶇姸鎬佸け璐ワ紒" + wrkMast.getSourceLocNo());
+ throw new Exception("淇敼婧愬簱浣嶇姸鎬佸け璐�");
+ }
+
+ try{
+ // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
+ if (wrkMastService.saveWrkMastLog(wrkMast.getWrkNo())==0) {
+ log.error(" stnToCrnStnPick2 --- 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗eけ璐ワ紒" + wrkMast.getWrkNo());
+ }
+ // 鏇存柊宸ヤ綔妗f暟鎹姸鎬�
+ wrkMast.setIoTime(now);
+ wrkMast.setIoType(wrkMast.getIoType() - 50); // 鍏ュ嚭搴撶被鍨�: 107->57 103->53
+ wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵��: 2.璁惧涓婅蛋
+ wrkMast.setSourceStaNo(param.getSourceStaNo()); // 婧愮珯
+ wrkMast.setStaNo(dto.getStaNo()); // 鐩爣绔�
+ wrkMast.setModiTime(now);
+ wrkMast.setLocNo(dto.getLocNo());
+ wrkMast.setCrnNo(dto.getCrnNo());
+ if (!wrkMastService.updateById(wrkMast)) {
+ log.error(" stnToCrnStnPick --- 鏇存柊宸ヤ綔妗f暟鎹姸鎬佸け璐ワ紒" + wrkMast.getWrkNo());
+ throw new CoolException("鏇存柊宸ヤ綔妗f暟鎹姸鎬佸け璐�");
+ }
+ // 鏇存柊鏄庣粏妗o_time (鍘嗗彶妗e叧鑱斾娇鐢級
+ wrkDetlService.updateIoTimeWms(wrkMast.getWrkNo(),now);
+ }catch (Exception e){
+ throw new CoolException("鏇存柊宸ヤ綔妗f暟鎹姸鎬佸嚭閿�");
+ }
+ }catch (Exception e){
+ log.error("/pakin2/loc/v1:======鎵樼洏鐮�:"+param.getBarcode()+"鐩樼偣鍥炲簱鍑洪敊======>"+e);
+ return R.error("鏌ョ湅wmsError");
+ }
+ } else {
+ return R.error();
+ }
+ log.info("/pakin2/loc/v1:"+dto + "======鎵樼洏鐮�:"+param.getBarcode());
+ return R.ok().add(dto);
+ }
+
@PostMapping("/pakin/empty/loc/v1")
@ResponseBody
public synchronized R getLocNoEmpty(@RequestBody SearchLocParam param) {
diff --git a/src/main/resources/mapper/WrkDetlMapper.xml b/src/main/resources/mapper/WrkDetlMapper.xml
index 1400228..95881a1 100644
--- a/src/main/resources/mapper/WrkDetlMapper.xml
+++ b/src/main/resources/mapper/WrkDetlMapper.xml
@@ -130,4 +130,11 @@
group by awdl.wrk_no, awdl.io_time, awdl.matnr ,awdl.zpallet,awdl.specs,awdl.maktx,awdl.batch,awdl.source
</select>
+ <update id="updateIoTimeWms">
+ update asr_wrk_detl
+ set io_time = #{ioTime}
+ where 1=1
+ and wrk_no = #{workNo}
+ </update>
+
</mapper>
--
Gitblit v1.9.1