From 9216c1580be254037fed688882d90d87365f4f01 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 09 八月 2024 13:18:47 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/WrkDetlMapper.xml | 6 +
src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java | 3
src/main/java/com/zy/asrs/service/WrkMastService.java | 2
src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java | 4 +
src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java | 5 +
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 3
src/main/java/com/zy/common/web/WcsController.java | 151 +++++++++++++++++++++++++++++++++++++
src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java | 6
src/main/java/com/zy/asrs/entity/result/KeyValueVo.java | 6 +
src/main/java/com/zy/asrs/service/WrkDetlService.java | 1
10 files changed, 184 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/result/KeyValueVo.java b/src/main/java/com/zy/asrs/entity/result/KeyValueVo.java
index 667f06a..eb943db 100644
--- a/src/main/java/com/zy/asrs/entity/result/KeyValueVo.java
+++ b/src/main/java/com/zy/asrs/entity/result/KeyValueVo.java
@@ -11,5 +11,11 @@
private String name;
private Object value;
+ public KeyValueVo() {
+ }
+ public KeyValueVo(String name, Object value) {
+ this.name = name;
+ this.value = value;
+ }
}
diff --git a/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java b/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java
index e10e894..15503d5 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
@@ -25,4 +26,6 @@
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 e1a363b..689f800 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.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -23,4 +24,6 @@
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);
}
diff --git a/src/main/java/com/zy/asrs/service/WrkDetlService.java b/src/main/java/com/zy/asrs/service/WrkDetlService.java
index a40f47a..4239172 100644
--- a/src/main/java/com/zy/asrs/service/WrkDetlService.java
+++ b/src/main/java/com/zy/asrs/service/WrkDetlService.java
@@ -23,4 +23,5 @@
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 481b521..8e47c79 100644
--- a/src/main/java/com/zy/asrs/service/WrkMastService.java
+++ b/src/main/java/com/zy/asrs/service/WrkMastService.java
@@ -26,4 +26,6 @@
List<WrkMast> selectWrkMastWrkDetlMatnrBatch(Integer ioType,String matnr , String batch ,String grade,Integer crnNo);
+ int saveWrkMastLog(Integer wrkNo);
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
index babb339..e376c5d 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
@@ -55,9 +55,9 @@
if(station.getLoading()==null || !station.getLoading().equals("Y")) {
throw new CoolException(devpNo+"绔欑偣鏃犵墿");
}
- if(station.getWrkNo()!=null && station.getWrkNo()>0 && station.getWrkNo() < 9990) {
- throw new CoolException(devpNo+"绔欑偣宸叉湁宸ヤ綔鍙�");
- }
+// if(station.getWrkNo()!=null && station.getWrkNo()>0 && station.getWrkNo() < 9990) {
+// throw new CoolException(devpNo+"绔欑偣宸叉湁宸ヤ綔鍙�");
+// }
// if(!station.getInEnable().equals("Y")) {
// throw new CoolException(devpNo+"绔欑偣涓嶆槸鍙叆鐘舵��");
// }
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..9b15e6d 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
@@ -84,4 +84,8 @@
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 374f295..c904260 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
@@ -54,4 +54,9 @@
public List<WrkMast> selectWrkMastWrkDetlMatnrBatch(Integer ioType,String matnr , String batch ,String grade ,Integer crnNo) {
return this.baseMapper.selectWrkMastWrkDetlMatnrBatch(ioType,matnr,batch,grade,crnNo);
}
+
+ @Override
+ public int saveWrkMastLog(Integer workNo){
+ return this.baseMapper.saveWrkMastLog(workNo);
+ };
}
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 066530a..0166615 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -7,6 +7,7 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.EmptyPlateOutParam;
+import com.zy.asrs.entity.result.KeyValueVo;
import com.zy.asrs.service.*;
import com.zy.common.CodeRes;
import com.zy.common.model.LocTypeDto;
@@ -49,6 +50,156 @@
private RowLastnoService rowLastnoService;
@Autowired
private WorkService workService;
+ @Autowired
+ private StaDescService staDescService;
+
+ @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);
+
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
+ .eq("barcode", param.getBarcode())
+ .eq("io_type", 107)
+ .eq("wrk_sts",14));
+ StartupDto dto = new StartupDto();
+
+ if (Cools.isEmpty(wrkMast)){
+ try{
+ log.info("/pakin2/loc/v1:"+dto + "======鎵樼洏鐮�:"+param.getBarcode()+"姝ょ瑪宸ヤ綔妗ｆ湭鏌ヨ鍒扮洏鐐瑰嚭搴撲换鍔★紝寮�濮嬫煡璇㈢洏鐐瑰湪鍏ュ簱浠诲姟==銆�");
+ WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
+ .eq("barcode", param.getBarcode())
+ .eq("io_type", 57)
+ .eq("wrk_sts",2));
+ if (Cools.isEmpty(wrkMast1)){
+ return R.error("鏈煡璇㈠埌宸ヤ綔妗�===銆嬫墭鐩樼爜:"+param.getBarcode());
+ }
+ // 鑾峰彇鐩爣绔�
+ Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
+ .eq("type_no", 57)
+ .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={}", 57, 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宸ヤ綔妗ｇ洰鏍囩珯鐐癸細"+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()+"姝ょ瑪宸ヤ綔妗ｅ凡缁忔槸鐩樼偣鍐嶅叆搴撶姸鎬侊紝杩斿洖wcs涓嬪彂淇℃伅");
+ return R.ok().add(dto);
+ }catch (Exception e){
+ log.error("/pakin2/loc/v1:======鎵樼洏鐮�:"+param.getBarcode()+"鐩樼偣鍥炲簱鏌ヨ宸ヤ綔妗ｅ嚭閿�======>"+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{
+ // 妫�绱㈠簱浣�
+ List<KeyValueVo> list = locDetls.stream().map(item -> new KeyValueVo(item.getMatnr(), item.getBatch())).distinct().collect(Collectors.toList());
+ try{
+// dto = commonService.getLocNo(1, 57, param.getSourceStaNo(), list, locTypeDto, 0);
+ dto= commonService.getLocNo(1, param.getSourceStaNo(), locDetls.get(0).getMatnr(),locDetls.get(0).getBatch() ,null,locTypeDto);
+ }catch (Exception e){
+ log.error("鍫嗗灈鏈虹珯鐩樼偣鍐嶅叆搴撴煡璇㈠簱浣嶅嚭閿�:"+e.getMessage()+e);
+ return R.error("e.getMessage()");
+// throw new Exception("鏌ヨ搴撲綅鍑洪敊锛屽弬鏁帮細param.getSourceStaNo():"+param.getSourceStaNo()+"==>list:"+list+"==>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 --- 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗ｅけ璐ワ紒" + wrkMast.getWrkNo());
+ }
+ // 鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬�
+ wrkMast.setIoTime(now);
+ wrkMast.setIoType(wrkMast.getIoType() - 50); // 鍏ュ嚭搴撶被鍨�: 107->57
+ 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 --- 鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬佸け璐ワ紒" + wrkMast.getWrkNo());
+ throw new CoolException("鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬佸け璐�");
+ }
+ // 鏇存柊鏄庣粏妗o_time (鍘嗗彶妗ｅ叧鑱斾娇鐢級
+ wrkDetlService.updateIoTimeWms(wrkMast.getWrkNo(),now);
+ }catch (Exception e){
+ throw new CoolException("鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬佸嚭閿�");
+ }
+ }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/loc/v1")
@ResponseBody
diff --git a/src/main/resources/mapper/WrkDetlMapper.xml b/src/main/resources/mapper/WrkDetlMapper.xml
index e94832f..e99d6bf 100644
--- a/src/main/resources/mapper/WrkDetlMapper.xml
+++ b/src/main/resources/mapper/WrkDetlMapper.xml
@@ -95,6 +95,12 @@
and matnr = #{matnr}
<include refid="batchSeq"></include>
</update>
+ <update id="updateIoTimeWms">
+ update asr_wrk_detl
+ set io_time = #{ioTime}
+ where 1=1
+ and wrk_no = #{workNo}
+ </update>
<select id="selectPakoutQuery" resultMap="BaseResultMap">
select
--
Gitblit v1.9.1