From 53e6f1f17213a0124c5f8d3ec854d2e033bc19c8 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 25 十月 2023 14:29:09 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java | 143 +++++++++++++++++++++++++++++++++++
src/main/java/com/zy/asrs/task/BareBoardScheduler.java | 42 ++++++++++
src/main/java/com/zy/system/service/impl/ConfigServiceImpl.java | 5 +
src/main/java/com/zy/system/mapper/ConfigMapper.java | 3
src/main/java/com/zy/asrs/service/WrkMastService.java | 2
src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java | 5 +
src/main/java/com/zy/system/service/ConfigService.java | 1
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 4 +
src/main/java/com/zy/common/properties/SlaveWmsParameterProperties.java | 23 +++++
src/main/resources/mapper/ConfigMapper.xml | 6 +
src/main/resources/application.yml | 6 +
11 files changed, 240 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
index dd349bd..2fefe09 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.WrkMast;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
import org.springframework.stereotype.Repository;
import java.util.List;
@@ -16,4 +17,7 @@
List<WrkMast> selectToBeHistoryData();
+ @Select("select count(1) from asr_wrk_mast where 1=1 and io_type = #{ioType} and sta_no = #{staNo}")
+ int selectWrkMastBareBoardStaNo(Integer ioType,Integer staNo);
+
}
diff --git a/src/main/java/com/zy/asrs/service/WrkMastService.java b/src/main/java/com/zy/asrs/service/WrkMastService.java
index ff9c2ba..2d4b5b9 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 selectWrkMastBareBoardStaNo(Integer ioType,Integer staNo);
}
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..3b7144d 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,9 @@
.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 selectWrkMastBareBoardStaNo(Integer ioType,Integer staNo) {
+ return this.baseMapper.selectWrkMastBareBoardStaNo(ioType,staNo);
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/task/BareBoardScheduler.java b/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
new file mode 100644
index 0000000..498483b
--- /dev/null
+++ b/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
@@ -0,0 +1,42 @@
+package com.zy.asrs.task;
+
+import com.core.common.Cools;
+import com.zy.asrs.task.handler.BareBoardHandler;
+import com.zy.common.properties.SlaveWmsParameterProperties;
+import com.zy.system.entity.Config;
+import com.zy.system.service.ConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Created by Monkey D. Luffy on 2023.10.25
+ * 骞垮痉瀹滅..............浠ヤ笅.............骞垮痉瀹滅.............鑷姩琛ョ┖鏉垮啀浼樺寲
+ */
+@Component
+public class BareBoardScheduler {
+
+ @Autowired
+ private BareBoardHandler bareBoardHandler;
+ @Autowired
+ private ConfigService configService;
+ @Autowired
+ private SlaveWmsParameterProperties slaveWmsParameterProperties;
+
+ /*
+ * 鑷姩璋冪┖鏉垮嚭搴�
+ * */
+ @Scheduled(cron = "0/3 * * * * ? ")
+ private void execute(){
+ if (slaveWmsParameterProperties.isAutomaticFillingBoardStaNosBoolean()){
+ Config config = configService.selectConfigByCode("AutomaticFillingBoard");
+ if (!Cools.isEmpty(config) && !Cools.isEmpty(config.getValue()) && config.getValue().equals("true")){
+ for (Integer staNo : slaveWmsParameterProperties.getAutomaticFillingBoardStaNos()){
+ bareBoardHandler.start(110,staNo,"D");
+ }
+ }
+ }
+ }
+}
diff --git a/src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java b/src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java
new file mode 100644
index 0000000..8ce0fd0
--- /dev/null
+++ b/src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java
@@ -0,0 +1,143 @@
+package com.zy.asrs.task.handler;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.core.common.Cools;
+import com.core.exception.CoolException;
+import com.zy.asrs.entity.BasCrnp;
+import com.zy.asrs.entity.LocMast;
+import com.zy.asrs.entity.StaDesc;
+import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.service.BasCrnpService;
+import com.zy.asrs.service.LocMastService;
+import com.zy.asrs.service.StaDescService;
+import com.zy.asrs.service.WrkMastService;
+import com.zy.asrs.task.AbstractHandler;
+import com.zy.asrs.task.core.ReturnT;
+import com.zy.common.model.enums.WorkNoType;
+import com.zy.common.service.CommonService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Created by Monkey D. Luffy on 2023.10.25
+ * 骞垮痉瀹滅..............浠ヤ笅.............骞垮痉瀹滅.............鑷姩琛ョ┖鏉垮啀浼樺寲
+ */
+@Slf4j
+@Service
+@Transactional
+public class BareBoardHandler extends AbstractHandler<String> {
+
+ @Autowired
+ private WrkMastService wrkMastService;
+ @Autowired
+ private LocMastService locMastService;
+ @Autowired
+ private CommonService commonService;
+ @Autowired
+ private StaDescService staDescService;
+ @Autowired
+ private BasCrnpService basCrnpService;
+
+ public ReturnT<String> start(Integer ioType,Integer staNo,String locStsTarget) {
+ try {
+ if (wrkMastService.selectWrkMastBareBoardStaNo(ioType,staNo)!=0){
+ return null;
+ }
+ // 鑾峰彇宸ヤ綔鍙�
+ int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
+ ArrayList<Integer> crns =new ArrayList<>();
+ List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<BasCrnp>().eq("crn_sts", 3).eq("out_enable", "Y").eq("wrk_no", 0));
+ for (BasCrnp basCrnp : basCrnps){
+ crns.add(basCrnp.getCrnNo());
+ }
+ for (BasCrnp basCrnp : basCrnpService.selectList(new EntityWrapper<>())){
+ crns.add(basCrnp.getCrnNo());
+ }
+ if (Cools.isEmpty(crns) || crns.size()==0){
+ return null;
+ }
+
+ boolean sign = true;
+ for (Integer crnNo : crns){
+ sign = true;
+ // 鑾峰彇搴撲綅
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts",locStsTarget).eq("crn_no",crnNo));
+
+ if (Cools.isEmpty(locMast)) {
+// throw new CoolException("搴撲腑鏃犵┖鏉匡紒锛侊紒");
+ sign=false;
+ }
+ if (sign && !locMast.getLocSts().equals(locStsTarget)){
+// throw new CoolException("鎵�閫夊簱浣嶅瓨鍦ㄧ姸鎬佷笉涓篋鐨勫簱浣嶏紝搴撲綅鍙凤細"+locMast.getLocNo()+" 銆佸綋鍓嶇姸鎬侊細"+locMast.getLocSts()+"-"+locMast.getLocSts$());
+ sign=false;
+ }
+ if (sign){
+ // 鑾峰彇婧愮珯
+ Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
+ .eq("type_no", ioType)
+ .eq("stn_no", staNo)
+ .eq("crn_no", crnNo);
+ StaDesc staDesc = staDescService.selectOne(wrapper);
+ Integer sourceStaNo = staDesc.getCrnStn();
+ if (Cools.isEmpty(sourceStaNo)) {
+// throw new CoolException("妫�绱㈡簮绔欏け璐�");
+ sign = false;
+ }
+ if (sign){
+ Date now = new Date();
+ // 淇濆瓨宸ヤ綔妗�
+ WrkMast wrkMast = new WrkMast();
+ wrkMast.setWrkNo(workNo);
+ wrkMast.setIoTime(now);
+ wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵��
+ wrkMast.setIoType(ioType); // 鍏ュ嚭搴撶姸鎬�
+ wrkMast.setIoPri(10D);
+ wrkMast.setSourceStaNo(sourceStaNo); // 婧愮珯
+ wrkMast.setStaNo(staNo); // 鐩爣绔�
+ wrkMast.setCrnNo(locMast.getCrnNo());
+ wrkMast.setSourceLocNo(locMast.getLocNo()); // 婧愬簱浣�
+ wrkMast.setFullPlt(ioType.equals(110)? "N" : "Y"); // 婊℃澘锛歒
+ wrkMast.setPicking("N"); // 鎷ｆ枡
+ wrkMast.setExitMk("N"); // 閫�鍑�
+ wrkMast.setEmptyMk(ioType.equals(110)? "Y" : "N"); // 绌烘澘
+ wrkMast.setLinkMis("N");
+ wrkMast.setAppeUser(9999L);
+ wrkMast.setAppeTime(now);
+ wrkMast.setModiUser(9999L);
+ wrkMast.setModiTime(now);
+ boolean res = wrkMastService.insert(wrkMast);
+ if (!res) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
+ }
+ // 鏇存柊搴撲綅鐘舵�� D.绌烘澘 -> R.鍑哄簱棰勭害
+ if (locMast.getLocSts().equals(locStsTarget)){
+ locMast.setLocSts("R");
+ locMast.setModiUser(9999L);
+ locMast.setModiTime(now);
+ if (!locMastService.updateById(locMast)) {
+ throw new CoolException("鏇存柊搴撲綅鐘舵�佸け璐�");
+ }else {
+ return SUCCESS;
+ }
+ }
+ }
+ }
+ }
+ if (!sign){
+ log.error("鏈煡鍒板彲鍑哄簱鐨勭┖鏉匡紒锛侊紒");
+ return null;
+ }
+ }catch (Exception e){
+ log.error("寮傚父锛侊紒锛�"+e);
+ return null;
+ }
+ return SUCCESS;
+ }
+}
diff --git a/src/main/java/com/zy/common/properties/SlaveWmsParameterProperties.java b/src/main/java/com/zy/common/properties/SlaveWmsParameterProperties.java
new file mode 100644
index 0000000..7d7111e
--- /dev/null
+++ b/src/main/java/com/zy/common/properties/SlaveWmsParameterProperties.java
@@ -0,0 +1,23 @@
+package com.zy.common.properties;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by vincent on 2023/10/25
+ */
+@Data
+@Configuration
+@ConfigurationProperties(prefix = "wms-parameter")
+public class SlaveWmsParameterProperties {
+
+ // 鑷姩琛ョ┖鏉垮姛鑳藉紑鍏�
+ private boolean automaticFillingBoardStaNosBoolean;
+ // 鑷姩琛ョ┖鏉跨珯鐐�
+ private List<Integer> automaticFillingBoardStaNos = new ArrayList<>();
+
+}
diff --git a/src/main/java/com/zy/system/mapper/ConfigMapper.java b/src/main/java/com/zy/system/mapper/ConfigMapper.java
index 9ec6ab3..1ec2693 100644
--- a/src/main/java/com/zy/system/mapper/ConfigMapper.java
+++ b/src/main/java/com/zy/system/mapper/ConfigMapper.java
@@ -3,10 +3,13 @@
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.system.entity.Config;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
@Mapper
@Repository
public interface ConfigMapper extends BaseMapper<Config> {
+ Config selectConfigByCode(@Param("code") String code);
+
}
diff --git a/src/main/java/com/zy/system/service/ConfigService.java b/src/main/java/com/zy/system/service/ConfigService.java
index 7e31e9a..6100b23 100644
--- a/src/main/java/com/zy/system/service/ConfigService.java
+++ b/src/main/java/com/zy/system/service/ConfigService.java
@@ -5,4 +5,5 @@
public interface ConfigService extends IService<Config> {
+ Config selectConfigByCode(String code);
}
diff --git a/src/main/java/com/zy/system/service/impl/ConfigServiceImpl.java b/src/main/java/com/zy/system/service/impl/ConfigServiceImpl.java
index 0a8661c..dc9a0e0 100644
--- a/src/main/java/com/zy/system/service/impl/ConfigServiceImpl.java
+++ b/src/main/java/com/zy/system/service/impl/ConfigServiceImpl.java
@@ -9,4 +9,9 @@
@Service("configService")
public class ConfigServiceImpl extends ServiceImpl<ConfigMapper, Config> implements ConfigService {
+ @Override
+ public Config selectConfigByCode(String code){
+ return this.baseMapper.selectConfigByCode(code);
+ };
+
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 704666e..9ec9d4d 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -57,6 +57,12 @@
doubleLocsLeft: 1,5,9,13
# 鍙虫繁搴撲綅鎺掑彿
doubleLocsRight: 4,8,12,16
+# wms鍙傛暟閰嶇疆
+wms-parameter:
+ # 鑷姩琛ョ┖鏉垮姛鑳藉紑鍏�
+ automaticFillingBoardStaNosBoolean: true
+ # 鑷姩琛ョ┖鏉跨珯鐐�
+ automaticFillingBoardStaNos: 112,101
comb:
limit: 5000
diff --git a/src/main/resources/mapper/ConfigMapper.xml b/src/main/resources/mapper/ConfigMapper.xml
index 8673fe5..f5f269f 100644
--- a/src/main/resources/mapper/ConfigMapper.xml
+++ b/src/main/resources/mapper/ConfigMapper.xml
@@ -13,4 +13,10 @@
</resultMap>
+ <select id="selectConfigByCode" resultMap="BaseResultMap">
+ select top 1 * from sys_config
+ where 1=1
+ and code=#{code}
+ </select>
+
</mapper>
--
Gitblit v1.9.1