From 891fa06cf39c457a07214f1c82efc0b12b4c1d43 Mon Sep 17 00:00:00 2001
From: gt-fuwuqi <3272660260@qq.com>
Date: 星期六, 30 十一月 2024 10:41:56 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/WrkMastMapper.xml | 6 +++---
src/main/java/com/zy/asrs/controller/MobileController.java | 16 ++++++++--------
src/main/java/com/zy/common/web/WcsController.java | 10 +++++-----
src/main/java/com/zy/common/service/CommonService.java | 20 ++++++++++----------
src/main/resources/application.yml | 2 +-
5 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index a387938..a8121cb 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -560,19 +560,19 @@
int w = 64;
for (int i = 17; i <= 37; i++) {
for (int j = 1;j<=3;j++){
- LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 7).eq("lev1", j));
+// LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 7).eq("lev1", j));
LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 12).eq("lev1", j));
LocMast locMast3 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 14).eq("lev1", j));
// LocMast locMast4 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", 26).eq("bay1", i).eq("lev1", 1));
- if (locMast.getGro1() == 999){
- continue;
- }
+// if (locMast.getGro1() == 999){
+// continue;
+// }
// locMast.setGro1(w);
- locMast.setGro1(locMast.getGro1()+1000);
- locMast2.setGro1(locMast.getGro1()+1000);
- locMast3.setGro1(locMast.getGro1()+1000);
+// locMast.setGro1(locMast.getGro1()+1000);
+ locMast2.setGro1(locMast2.getGro1()+10000);
+ locMast3.setGro1(locMast3.getGro1()+2000);
// locMast4.setGro1(w);
- locMastService.updateById(locMast);
+// locMastService.updateById(locMast);
locMastService.updateById(locMast2);
locMastService.updateById(locMast3);
// locMastService.updateById(locMast4);
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 47d85bf..a8e9ebf 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -536,7 +536,7 @@
// 鐩镐技宸ヤ綔妗ｆ --- 鍚屽ぉ鍚岃鏍肩墿鏂�
- if (!Cools.isEmpty(matnr) && (staDescId == 1 || staDescId == 11 || staDescId == 111) ) {
+ if (!Cools.isEmpty(matnr) && (staDescId == 1 || staDescId == 11 || staDescId == 111) && !mixture ) {
//鏌ヨ鐩镐技宸ヤ綔妗ｆ
List<WrkMast> wrkMasts = wrkMastService.selectWrkMastWrkDetlMatnrBatch(staDescId, matnr, batch,grade, crnNo);
int nearbay = 0; //鐩镐技宸ヤ綔妗ｆ 鐩爣搴撲綅鍒�
@@ -567,15 +567,6 @@
continue;
}
for (LocMast locMastGro1 : locMasts) {
- if (mixture){ //娣锋枡鍙厑璁告斁 7 12 14
- if (locMastGro1.getBay1() != 7 && locMastGro1.getBay1() != 12 && locMastGro1.getBay1() != 14){
- continue;
- }
- }else { //涓嶆贩鏂欎笉鍏佽鏀� 7 12 14
- if (locMastGro1.getBay1() == 7 || locMastGro1.getBay1() == 12 || locMastGro1.getBay1() == 14){
- continue;
- }
- }
if (locMastGro1.getBay1() == 2){ //wcs闂闄愬埗
continue;
@@ -674,6 +665,15 @@
continue;
}
for (LocMast locMastGro1 : locMasts1) {
+ if (mixture){ //娣锋枡鍙厑璁告斁 7 12 14
+ if (locMastGro1.getBay1() != 7 && locMastGro1.getBay1() != 12 && locMastGro1.getBay1() != 14){
+ continue;
+ }
+ }else { //涓嶆贩鏂欎笉鍏佽鏀� 7 12 14
+ if (locMastGro1.getBay1() == 7 || locMastGro1.getBay1() == 12 || locMastGro1.getBay1() == 14){
+ continue;
+ }
+ }
if (locMastGro1.getLocSts().equals("F")){
LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_No", locMastGro1.getLocNo()));
if (!locDetl.getMatnr().equals(matnr) || !locDetl.getBatch().equals(batch)){
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 5e3124c..2dbe6c8 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -66,7 +66,7 @@
String sta = param.get("sta");
// 鍛戒护闆嗗悎
List<LedCommand> commands = new ArrayList<>();
- if ("0".equals(sta)) {
+ if (!"0".equals(taskNo)) {
// 宸ヤ綔妗ｉ泦鍚�
List<WrkMast> wrkMasts = new ArrayList<>();
@@ -139,7 +139,7 @@
for (WrkMast wrkMast1 : wrkMasts) {
wrkMast1.setOveMk("Y");
wrkMast1.setModiTime(new Date());
- if (wrkMastService.updateById(wrkMast1)) {
+ if (!wrkMastService.update(wrkMast1,new EntityWrapper<WrkMast>().eq("wrk_No",wrkMast1.getWrkNo()))) {
throw new CoolException("鏇存柊宸ヤ綔妗ｅけ璐�");
}
}
@@ -160,7 +160,7 @@
public synchronized R getledError(@RequestBody Map<String, String> param) {
String sta = param.get("sta");
String message = param.get("msg");
- if (Cools.isEmpty(sta) || Cools.isEmpty(message)) {
+ if (Cools.isEmpty(sta) ) {
return R.error();
}
Map<String,Object> map=new HashMap<String, Object>();
@@ -192,7 +192,7 @@
if (Cools.isEmpty(staDesc)){
throw new CoolException("鏈壘鍒扮珯鐐硅矾寰�");
}
- if (wrkMast.getWrkSts() == 14 && wrkMast.getIoType() == 103){
+ if (wrkMast.getWrkSts() == 14 && (wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107)){
try {
// 淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。
if (wrkMastService.saveWrkDetlLog(wrkMast.getWrkNo()) == 0) {
@@ -399,7 +399,7 @@
}
WrkMast wrkMastPakin = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
.eq("barcode", param.getBarcode())
- .in("io_type", 103,53)
+ .in("io_type", 103,53,107,57)
.eq("wrk_sts",14));
if (!Cools.isEmpty(wrkMastPakin)){
StartupDto locNo3 = getLocNo3(param);
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 67034af..e29eeec 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -105,4 +105,4 @@
url: ""
taskCreatePath: ""
shuttleWcs:
- url: "10.200.50.222:9090/wcs"
\ No newline at end of file
+ url: "10.0.100.140:8088/wcs"
\ No newline at end of file
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 2272b9a..7c417dd 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -69,9 +69,9 @@
<select id="selectToBeHistoryData" resultMap="BaseResultMap">
select * from asr_wrk_mast
where wrk_sts=5
- or (wrk_sts=15 and ove_mk='Y' and wrk_no not in (select wrk_no from asr_bas_devp))
- or (wrk_sts=15 and (dateadd(mi,15,crn_end_time) <= getdate()) and wrk_no not in (select wrk_no from asr_bas_devp))
- or (wrk_sts=15 and (dateadd(mi,15,crn_end_time) <= getdate()) and crn_end_time is null and wrk_no not in (select wrk_no from asr_bas_devp))
+ or (wrk_sts=15 and ove_mk='Y' and wrk_no not in (select wrk_no from asr_bas_devp))
+ or (wrk_sts=15 and (dateadd(mi,5,crn_end_time) <= getdate() or dateadd(mi,1,modi_time) <= getdate()) and wrk_no not in (select wrk_no from asr_bas_devp))
+ or (wrk_sts=15 and (dateadd(mi,5,crn_end_time) <= getdate() or dateadd(mi,1,modi_time) <= getdate()) and crn_end_time is null and wrk_no not in (select wrk_no from asr_bas_devp))
order by io_time,wrk_no asc
</select>
--
Gitblit v1.9.1