From 9c699c554f021930ee3598261f43e6dfd9cccb9c Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期二, 07 一月 2025 08:35:50 +0800
Subject: [PATCH] #拣料盘点优化(仍有回库顺序不同堵塞问题)
---
src/main/java/com/zy/asrs/mapper/LocDetlMapper.java | 2
src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java | 6 +
src/main/java/com/zy/asrs/service/LocDetlService.java | 2
src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java | 10 +
src/main/resources/mapper/LocDetlMapper.xml | 7 +
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 4
src/main/java/com/zy/common/web/WcsController.java | 102 ++++++++++-------
src/main/resources/mapper/WrkDetlMapper.xml | 7 +
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 7
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 11 +
src/main/java/com/zy/common/service/CommonService.java | 151 +++++++++++++++++++++++++
src/main/webapp/views/login.html | 4
src/main/java/com/zy/asrs/service/WrkDetlService.java | 6 +
13 files changed, 269 insertions(+), 50 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index aa847f3..a2c043b 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -23,6 +23,8 @@
LocDetl selectItem(@Param("locNo")String locNo, @Param("matnr")String matnr, @Param("batch")String batch);
+ LocDetl selectItemByLocNo(String locNo);
+
int deleteItem(@Param("locNo")String locNo, @Param("matnr")String matnr, @Param("batch")String batch);
int updateAnfme(@Param("anfme")Double anfme, @Param("locNo")String locNo, @Param("matnr")String matnr, @Param("batch")String batch);
diff --git a/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java b/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java
index e10e894..291d977 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
@@ -13,6 +14,8 @@
public interface WrkDetlMapper extends BaseMapper<WrkDetl> {
List<WrkDetl> selectByWrkNo(Integer wrkNo);
+
+ WrkDetl selectSingleByWrkNo(Integer workNo);
int deleteItem(@Param("wrkNo")Integer wrkNo, @Param("matnr")String matnr, @Param("batch")String batch);
@@ -25,4 +28,7 @@
List<WrkDetl> selectPakoutQuery(@Param("staNo")Integer staNo, @Param("matnr")String matnr);
List<WrkDetl> selectAndLogByOrderNoGroupByMatnrOfSum(String orderNo);
+
+ int updateIoTime(@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 e1a363b..3b0a327 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -2,9 +2,7 @@
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.WrkMast;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.*;
import org.springframework.stereotype.Repository;
import java.util.List;
@@ -23,4 +21,11 @@
List<WrkMast> selectWrkMastWrkDetlMatnrBatch(@Param("ioType") Integer ioType, @Param("matnr") String matnr , @Param("batch") String batch , @Param("grade") String grade , @Param("crnNo") Integer crnNo);
+ @Insert("insert into asr_wrk_mast_log select * from asr_wrk_mast where wrk_no=#{workNo}")
+ int saveWrkMastLog(Integer workNo);
+
+ @Insert("insert into asr_wrk_detl_log select * from asr_wrk_detl where wrk_no=#{workNo}")
+ int saveWrkDetlLog(Integer workNo);
+
+
}
diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
index c93f976..adf1a03 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -15,6 +15,8 @@
LocDetl selectItem(String locNo, String matnr, String batch);
+ LocDetl selectItemByLocNo(String locNo);
+
Page<LocDetl> getStockOut(Page<LocDetl> page);
/**
diff --git a/src/main/java/com/zy/asrs/service/WrkDetlService.java b/src/main/java/com/zy/asrs/service/WrkDetlService.java
index a40f47a..5997bcb 100644
--- a/src/main/java/com/zy/asrs/service/WrkDetlService.java
+++ b/src/main/java/com/zy/asrs/service/WrkDetlService.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.WrkDetl;
+import com.zy.asrs.entity.WrkMast;
import com.zy.common.model.DetlDto;
import java.util.Date;
@@ -13,6 +14,8 @@
List<WrkDetl> selectByWrkNo(Integer wrkNo);
+ WrkDetl selectSingleByWrkNo(Integer workNo);
+
boolean updateAnfme(Double anfme, Integer wrkNo, String matnr, String batch);
List<WrkDetl> selectAndLogByOrderNo(String orderNo);
@@ -23,4 +26,7 @@
List<WrkDetl> selectAndLogByOrderNoGroupByMatnrOfSum(String orderNo);
+ boolean updateIoTime(Integer workNo, Date ioTime);
+
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
index 6ee792d..5a4f0a8 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -118,6 +118,10 @@
return this.baseMapper.selectItem(locNo, matnr, batch);
}
+ public LocDetl selectItemByLocNo(String locNo) {
+ return this.baseMapper.selectItemByLocNo(locNo);
+ }
+
@Override
public Double getLocDetlSumQty(String locNo) {
return this.baseMapper.selectLocDetlSumQty(locNo);
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 30b3554..be77333 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -240,7 +240,7 @@
// 璁＄畻浼樺厛绾�
dto.setPriority(priority);
- priority++; // 涓嬩竴涓换鍔′紭鍏堢骇閫掑
+ priority--; // 涓嬩竴涓换鍔′紭鍏堢骇閫掑
// 鑾峰彇搴撲綅
LocMast locMast = locMastService.selectById(dto.getLocNo());
@@ -266,6 +266,7 @@
// 鐢熸垚宸ヤ綔鍙�
int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
+ String pick = ioType == 101 ? "N":"Y";
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
@@ -279,7 +280,7 @@
wrkMast.setStaNo(staDesc.getStnNo());
wrkMast.setSourceLocNo(dto.getLocNo());
wrkMast.setFullPlt("Y");
- wrkMast.setPicking("N");
+ wrkMast.setPicking(pick);
wrkMast.setExitMk("N");
wrkMast.setEmptyMk("N");
wrkMast.setLinkMis("N");
@@ -906,7 +907,7 @@
} else if (wrkMast.getIoType() > 100 && wrkMast.getWrkSts() != 14) {
locNo = wrkMast.getSourceLocNo();
// 鍑哄簱 ===>> F.鍦ㄥ簱
- if (wrkMast.getIoType() == 101) {
+ if (wrkMast.getIoType() == 101 || wrkMast.getIoType() == 103) {
locSts = "F";
// 绌烘澘鍑哄簱 ===>> D.绌烘《/绌烘爤鏉�
} else if (wrkMast.getIoType() == 110) {
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 3eaaa7a..1c5eaf5 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
@@ -57,6 +57,11 @@
}
@Override
+ public WrkDetl selectSingleByWrkNo(Integer wrkNo) {
+ return this.baseMapper.selectSingleByWrkNo(wrkNo);
+ }
+
+ @Override
public boolean updateAnfme(Double anfme, Integer wrkNo, String matnr, String batch) {
if (anfme <= 0) {
return this.baseMapper.deleteItem(wrkNo, matnr, batch) > 0;
@@ -84,4 +89,9 @@
public List<WrkDetl> selectAndLogByOrderNoGroupByMatnrOfSum(String orderNo) {
return this.baseMapper.selectAndLogByOrderNoGroupByMatnrOfSum(orderNo);
}
+
+ @Override
+ public boolean updateIoTime(Integer workNo, Date ioTime) {
+ return this.baseMapper.updateIoTime(workNo, ioTime) > 0;
+ }
}
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 55a2f22..92420c0 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -597,6 +597,157 @@
return startupDto;
}
+ public StartupDto getLocNoRunPick(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, Integer moveCrnNo, LocTypeDto locTypeDto, int times) {
+ int crnNo = 1;//灏忚溅缂栧彿澶囩敤
+ RowLastno rowLastno = rowLastnoService.selectById(4);
+ LocMast locMast = null; // 鐩爣搴撲綅
+ StartupDto startupDto = new StartupDto();
+ int curRow = rowLastno.getCurrentRow();
+ int sRow = rowLastno.getsRow();
+ int eRow = rowLastno.geteRow();
+ int nearRow = 8;//鐗规畩鍗曟帓
+ int orbit = 7;//杞ㄩ亾
+ // 鐩镐技宸ヤ綔妗ｆ --- 鍚屽ぉ鍚岃鏍肩墿鏂�
+ if (!Cools.isEmpty(matnr) && (staDescId == 1 || staDescId == 11 || staDescId == 111) ) {
+ //鏌ヨ鐩镐技宸ヤ綔妗ｆ
+ List<WrkMast> wrkMasts = wrkMastService.selectWrkMastWrkDetlMatnrBatch(1, matnr, batch,null, crnNo);
+ for (WrkMast wrkMast:wrkMasts){
+ if (Cools.isEmpty(wrkMast.getLocNo())){
+ continue;
+ }
+ //鐩爣鎺掍负杞ㄩ亾澶栨帓
+ if (Utils.getRow(wrkMast.getLocNo()) == orbit || Utils.getRow(wrkMast.getLocNo()) == nearRow){
+ continue;
+ }
+ //鏌ユ壘姝ゅ簱浣嶇殑娴呭簱浣嶆槸鍚︿负绌�
+ int value = Integer.valueOf(wrkMast.getLocNo().substring(0, 2)) + 1;
+ String loc="0"+value+wrkMast.getLocNo().substring(2);
+ LocMast locMast1=locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("loc_no",loc)
+ .eq("loc_sts","O")
+ .eq("loc_type1", locTypeDto.getLocType1())
+ );
+ if(Cools.isEmpty(locMast1)){
+ continue;
+ }
+ locMast=locMast1;
+ break;
+ }
+
+ }
+
+ // 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂�
+ if (Cools.isEmpty(locMast)) {
+ List<LocDetl> locNos = locDetlService.getSameDetlToday(matnr, batch,sRow, eRow);
+ for (LocDetl locNo : locNos) {
+ //鐩爣鎺掍负鏈�澶栧眰鎺�
+ if (Utils.getRow(locNo.getLocNo()) == nearRow || Utils.getRow(locNo.getLocNo()) == orbit){
+ continue;
+ }
+ LocMast locMast2=locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("loc_no",locNo.getLocNo())
+ .eq("loc_sts","F"));
+ if(Cools.isEmpty(locMast2)){
+ continue;
+ }
+ int value = Integer.valueOf(locNo.getLocNo().substring(0, 2)) + 1;
+ String loc="0"+value+locNo.getLocNo().substring(2);
+ LocMast locMast1=locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("loc_no",loc)
+ .eq("loc_sts","O")
+ .eq("loc_type1", locTypeDto.getLocType1())
+ );
+ if(Cools.isEmpty(locMast1)){
+ continue;
+ }
+ locMast=locMast1;
+ break;
+ }
+ }
+
+ // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭
+ if (staDescId == 10) {
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D").ge("row1", sRow).le("row1", eRow));
+ if (locMasts.size() > 0) {
+ for (LocMast loc : locMasts) {
+ if (Utils.isShallowLoc(slaveProperties, loc.getLocNo())) {
+ continue;
+ }
+ String shallowLocNo = Utils.getShallowLoc(slaveProperties, loc.getLocNo());
+ // 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣�
+ LocMast shallowLoc = locMastService.selectById(shallowLocNo);
+ if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
+ if (shallowLoc.getLocType1()<locTypeDto.getLocType1()){
+ continue;
+ }
+ if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {
+ locMast = shallowLoc;
+ crnNo = locMast.getCrnNo();
+ break;
+ }
+ }
+ }
+ }
+ }
+
+ // 鑾峰彇鐩爣绔�
+ Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
+ .eq("type_no", staDescId)
+ .eq("stn_no", sourceStaNo)
+ .eq("crn_no", 1);
+ StaDesc staDesc = staDescService.selectOne(wrapper);
+ if (Cools.isEmpty(staDesc)) {
+ log.error("type_no={},stn_no={},crn_no={}", staDescId, sourceStaNo, crnNo);
+ throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
+ }
+ BasDevp staNo = basDevpService.selectById(staDesc.getStnNo());
+ if (!staNo.getAutoing().equals("Y")) {
+ throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
+ }
+
+ // 濡傛灉娌℃湁鐩歌繎鐗╂枡锛屽垯鎸夎鍒欒疆璇㈣揣鏋�
+ if (null == locMast) {
+ LocMast locMast1 = new LocMast();
+ if(times != 0){
+ locMast1=locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("row1", 1)
+ .eq("loc_sts","O")
+ .eq("loc_type1", locTypeDto.getLocType1())
+ .orderBy("lev1,bay1 ASC"));
+ } else {
+ locMast1=locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("row1", 8)
+ .eq("loc_sts","O")
+ .eq("loc_type1", locTypeDto.getLocType1())
+ .orderBy("lev1,bay1 ASC"));
+ }
+ if(!Cools.isEmpty(locMast1)){
+ locMast=locMast1;
+ }
+ }
+ // 鏇存柊搴撲綅鎺掑彿
+ rowLastno.setCurrentRow(curRow);
+ rowLastnoService.updateById(rowLastno);
+
+ // 2.搴撲綅褰撳墠鎵�灞炲昂瀵告棤绌哄簱浣嶆椂锛岃皟鏁村昂瀵稿弬鏁帮紝鍚戜笂鍏煎妫�绱㈠簱浣�
+ if (Cools.isEmpty(locMast)) {
+ times = times - 1;
+ if (times >= 0) {
+ return getLocNoRun4(whsType,staDescId, sourceStaNo, matnr, batch, grade,moveCrnNo,locTypeDto,times);
+ }
+ log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛�", JSON.toJSONString(locTypeDto));
+ throw new CoolException("娌℃湁绌哄簱浣�");
+ }
+ String locNo = locMast.getLocNo();
+ // 杩斿洖鎵惧埌鐨勫簱浣�
+ startupDto.setWorkNo(0);
+ startupDto.setCrnNo(locMast.getCrnNo());
+ startupDto.setSourceStaNo(sourceStaNo);
+ startupDto.setLocNo(locNo);
+
+ return startupDto;
+ }
+
public StartupDto getLocNoRun5(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, Integer moveCrnNo, LocTypeDto locTypeDto, int times) {
if (Cools.isEmpty(matnr)) { //鐗╂枡鍙�
matnr = "";
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index a28c43a..1ee123a 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -10,6 +10,7 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.EmptyPlateOutParam;
import com.zy.asrs.entity.param.StatusParam;
+import com.zy.asrs.mapper.WrkMastMapper;
import com.zy.asrs.service.*;
import com.zy.common.CodeRes;
import com.zy.common.model.LocTypeDto;
@@ -57,6 +58,8 @@
private WorkService workService;
@Autowired
private ApiLogService apiLogService;
+ @Autowired
+ private WrkMastMapper wrkMastMapper;
@Value("${wcs-slave.url}")
private String url;
@Value("${wcs-slave.loc}")
@@ -76,7 +79,7 @@
if (param.getFromPort().equals("101")) {
//鏈夌┖鏉垮嚭搴撴椂绂佹鍏ュ簱
- int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type",110).eq("sta_no",100).notIn("wrk_sts",7));
+ int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 110).eq("sta_no", 100).notIn("wrk_sts", 7));
if(wrkCount > 0){
return Re.error("鏈夌┖鏉垮嚭搴撳埌100绔欐椂鏃剁姝㈠叆搴�");
}
@@ -97,15 +100,15 @@
if (countLoc > 0 || countWrk > 0) {
return Re.error(CodeRes.EXIST_500);
}
- }else {
+ } else {
//鏈夋弧鏉垮嚭搴撴椂绂佹绌烘澘鍏ュ簱
- int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no",100).andNew().eq("io_type",101).or().eq("io_type",110));
- if(wrkCount > 0){
+ int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", 100).andNew().eq("io_type", 101).or().eq("io_type", 110));
+ if (wrkCount > 0) {
return Re.error("鏈夋弧鏉垮嚭搴撴椂绂佹绌烘澘鍏ュ簱");
}
int countLoc = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 10));
- if (countLoc > 0 ) {
+ if (countLoc > 0) {
return Re.error("宸叉湁绌烘澘鍏ュ簱浠诲姟绂佹鍦ㄥ叆绌烘澘");
}
}
@@ -195,7 +198,7 @@
List<String> matnrs = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
List<String> batchs = waitPakins.stream().map(WaitPakin::getBatch).distinct().collect(Collectors.toList());
StartupDto dto = commonService.getLocNo(1, devpNo, matnrs.get(0), batchs.get(0), null, locTypeDto);
- if(dto == null){
+ if (dto == null) {
throw new CoolException("娌℃湁妫�绱㈠埌绌哄簱浣�");
}
int workNo = dto.getWorkNo();
@@ -325,14 +328,14 @@
@ResponseBody
public Re status(@RequestBody StatusParam statusParam) {
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", statusParam.getTaskId()));
- if(Cools.isEmpty(wrkMast)&&statusParam.getTaskStatus()!=8){
- return Re.error("娌℃湁鎵惧埌:"+statusParam.getTaskId()+"杩欐潯浠诲姟");
- }else if(Cools.isEmpty(wrkMast)&&statusParam.getTaskStatus()==8){
+ if (Cools.isEmpty(wrkMast) && statusParam.getTaskStatus() != 8) {
+ return Re.error("娌℃湁鎵惧埌:" + statusParam.getTaskId() + "杩欐潯浠诲姟");
+ } else if (Cools.isEmpty(wrkMast) && statusParam.getTaskStatus() == 8) {
return Re.ok();
- }else if(!Cools.isEmpty(wrkMast)&&statusParam.getTaskStatus()==8&&wrkMast.getIoType()==110){
+ } else if (!Cools.isEmpty(wrkMast) && statusParam.getTaskStatus() == 8 && wrkMast.getIoType() == 110) {
return Re.ok();
}
- /**
+ /*
* 浠诲姟鐘舵��
* 鎵ц杩囩▼涓�
* 鐨勭姸鎬併�� 0- 宸� 鎺�
@@ -341,41 +344,54 @@
* 浠诲姟涓柇,4-鏀捐揣
* 瀹屾垚,8-浠诲姟缁撴潫
*/
- if (statusParam.getTaskStatus()==0){
+ if (statusParam.getTaskStatus() == 0) {
//鎷ｆ枡鍜岀洏鐐瑰啀鍏ュ簱鍒ゆ柇
- if((wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107) && wrkMast.getWrkSts() == 14){
+ if ((wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107) && wrkMast.getWrkSts() == 14) {
+// LocDetl locDetl = locDetlService.selectItemByLocNo(wrkMast.getSourceLocNo());
+// List<WrkDetl> wrkDetl = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
+ String sourcecLocNo = wrkMast.getSourceLocNo();
+// // 鑾峰彇鍚庝袱浣嶇殑灞傛暟
+// String layerStr = sourcecLocNo.substring(sourcecLocNo.length() - 2);
+// int layer = Integer.parseInt(layerStr);
+// // 鍒ゆ柇灞傛暟
+// Short locType1 = (short) ((layer == 1) ? 1 : 2);
+// LocTypeDto locTypeDto = new LocTypeDto();
+// locTypeDto.setLocType1(locType1);
+// StartupDto dto = commonService.getLocNoRunPick(4, 1, 101, wrkDetl.get(0).getMatnr(), wrkDetl.get(0).getBatch(), null, 4, locTypeDto, 2);
Date now = new Date();
wrkMast.setIoTime(now);
wrkMast.setIoType(wrkMast.getIoType() - 50); // 鍏ュ嚭搴撶被鍨�: 103->53,104->54,107->57
wrkMast.setWrkSts(1L);//1.宸叉帴鏀�
wrkMast.setSourceStaNo(101); // 婧愮珯
wrkMast.setStaNo(null); // 鐩爣绔�
- wrkMast.setLocNo(wrkMast.getSourceLocNo()); // 鐩爣搴撲綅 = 鍑哄簱鏃剁殑婧愬簱浣�
- wrkMast.setSourceLocNo(""); // 婧愬簱浣嶆竻绌�
+ wrkMast.setLocNo(sourcecLocNo); // 鐩爣搴撲綅
+ wrkMast.setSourceLocNo("");
wrkMast.setModiTime(now);
+ wrkDetlService.updateIoTime(wrkMast.getWrkNo(), now);
+
// 淇敼搴撲綅鐘舵�� Q.鎷ｆ枡/鐩樼偣/骞舵澘鍐嶅叆搴�
- LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
- locMast.setLocSts("Q");
- locMast.setModiTime(new Date());
- if (!locMastService.updateById(locMast)) {
+ LocMast locMast2 = locMastService.selectById(sourcecLocNo);
+ locMast2.setLocSts("Q");
+ locMast2.setModiTime(new Date());
+ if (!locMastService.updateById(locMast2)) {
throw new CoolException("淇敼搴撲綅鐘舵�佸け璐�");
}
- }else{
+ } else {
wrkMast.setWrkSts(1L);//1.宸叉帴鏀�
}
- }else if (statusParam.getTaskStatus()==1){
+ } else if (statusParam.getTaskStatus() == 1) {
wrkMast.setWrkSts(2L);//2.浠诲姟寮�濮�
- }else if (statusParam.getTaskStatus()==2){
+ } else if (statusParam.getTaskStatus() == 2) {
wrkMast.setWrkSts(3L);//3.鍙栬揣瀹屾垚
- }else if (statusParam.getTaskStatus()==3){
+ } else if (statusParam.getTaskStatus() == 3) {
wrkMast.setWrkSts(6L);//6.浠诲姟涓柇
- } else if (statusParam.getTaskStatus()==4 || statusParam.getTaskStatus()==8){
- if(wrkMast.getIoType()==1 || wrkMast.getIoType() == 10 || wrkMast.getIoType() == 11 || wrkMast.getIoType() == 53 ||wrkMast.getIoType() == 57){
+ } else if (statusParam.getTaskStatus() == 4 || statusParam.getTaskStatus() == 8) {
+ if (wrkMast.getIoType() == 1 || wrkMast.getIoType() == 10 || wrkMast.getIoType() == 11 || wrkMast.getIoType() == 53 || wrkMast.getIoType() == 57) {
wrkMast.setWrkSts(4L);//4.鍏ュ簱瀹屾垚
- }else if (wrkMast.getIoType()==103 || wrkMast.getIoType()==107){
+ } else if (wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107) {
wrkMast.setWrkSts(14L);//14.宸插嚭搴撴湭纭
- }else if (wrkMast.getIoType()==101 || wrkMast.getIoType()==110){
+ } else if (wrkMast.getIoType() == 101 || wrkMast.getIoType() == 110) {
wrkMast.setWrkSts(7L);//7.鍑哄簱瀹屾垚
}
}
@@ -384,22 +400,22 @@
}
@GetMapping("loc")
- public void loc(){
- List<LocMast> locMasts=locMastService.selectList(new EntityWrapper<LocMast>());
- List<HashMap<String,Object>> mapList=new ArrayList<>();
+ public void loc() {
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>());
+ List<HashMap<String, Object>> mapList = new ArrayList<>();
for (LocMast locMast : locMasts) {
- if (locMast.getLev1()!=4){
- HashMap<String,Object> map=new HashMap<>();
- map.put("warehouse","wzzy");
- map.put("posiX",locMast.getRow1());
- map.put("posiY",locMast.getBay1());
- map.put("posiZ",locMast.getLev1());
- map.put("cargoNo",locMast.getLocNo());
- map.put("type","0");
+ if (locMast.getLev1() != 4) {
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("warehouse", "ddth");
+ map.put("posiX", locMast.getRow1());
+ map.put("posiY", locMast.getBay1());
+ map.put("posiZ", locMast.getLev1());
+ map.put("cargoNo", locMast.getLocNo());
+ map.put("type", "0");
mapList.add(map);
}
}
- if(mapList.size()>0){
+ if (mapList.size() > 0) {
String response = "";
boolean success = false;
try {
@@ -413,7 +429,7 @@
if (jsonObject.getInteger("returnStatus").equals(0)) {
success = true;
} else {
- log.error("wms鍚屾wcs搴撲綅澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", url+"/"+loc, JSON.toJSONString(mapList), response);
+ log.error("wms鍚屾wcs搴撲綅澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", url + "/" + loc, JSON.toJSONString(mapList), response);
throw new CoolException("wms涓嬪彂浠诲姟缁檞cs澶辫触");
}
} catch (Exception e) {
@@ -425,14 +441,16 @@
// 淇濆瓨鎺ュ彛鏃ュ織
apiLogService.save(
"wms鍚屾wcs搴撲綅澶辫触",
- url+"/"+loc,
+ url + "/" + loc,
null,
"127.0.0.1",
JSON.toJSONString(mapList),
response,
success
);
- } catch (Exception e) { log.error("", e); }
+ } catch (Exception e) {
+ log.error("", e);
+ }
}
}
}
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 4eaba6b..09bcd34 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -66,6 +66,13 @@
<include refid="batchSeq"></include>
</select>
+ <select id="selectItemByLocNo" resultMap="BaseResultMap">
+ select top 1 *
+ from asr_loc_detl
+ where 1=1
+ and loc_no = #{locNo}
+ </select>
+
<delete id="deleteItem">
delete from asr_loc_detl
where 1=1
diff --git a/src/main/resources/mapper/WrkDetlMapper.xml b/src/main/resources/mapper/WrkDetlMapper.xml
index e94832f..037f5ed 100644
--- a/src/main/resources/mapper/WrkDetlMapper.xml
+++ b/src/main/resources/mapper/WrkDetlMapper.xml
@@ -124,4 +124,11 @@
group by awdl.wrk_no, awdl.io_time, awdl.matnr ,awdl.zpallet,awdl.specs,awdl.maktx
</select>
+ <update id="updateIoTime">
+ update asr_wrk_detl
+ set io_time = #{ioTime}
+ where 1=1
+ and wrk_no = #{workNo}
+ </update>
+
</mapper>
diff --git a/src/main/webapp/views/login.html b/src/main/webapp/views/login.html
index 6a28662..15bf0d2 100644
--- a/src/main/webapp/views/login.html
+++ b/src/main/webapp/views/login.html
@@ -56,8 +56,8 @@
<img src="../static/image/logo.png" alt="" style="width: 20%">
</div>
<div class="p-sketch-outline">
- <h2 class="p-sketch-outline__title">Automatic Storage and Retrieval System</h2>
- <p class="p-sketch-outline__date">posted: 2018.01.01 / update: 2022.09.21
+<!-- <h2 class="p-sketch-outline__title">Automatic Storage and Retrieval System</h2>-->
+<!-- <p class="p-sketch-outline__date">posted: 2018.01.01 / update: 2022.09.21-->
</p>
<p class="p-sketch-outline__description">wms made with various simple objects.</p>
</div>
--
Gitblit v1.9.1