From 8575002e3bce8a6d16633d5c1a4eed99ccf638ce Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期三, 17 十二月 2025 16:50:55 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/api/enums/OrderWkType.java | 2
src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java | 83 +++++++++++---------
src/main/webapp/static/js/basStation/basStation.js | 1
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 23 +++++
src/main/java/com/zy/api/service/KopenApiService.java | 4
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 41 +++-------
src/main/java/com/zy/asrs/entity/WrkMast.java | 8 +-
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 3
src/main/java/com/zy/api/controller/KopenApiController.java | 14 ++-
src/main/webapp/static/js/orderPakout/agvOut.js | 2
10 files changed, 100 insertions(+), 81 deletions(-)
diff --git a/src/main/java/com/zy/api/controller/KopenApiController.java b/src/main/java/com/zy/api/controller/KopenApiController.java
index 7826534..3e7af17 100644
--- a/src/main/java/com/zy/api/controller/KopenApiController.java
+++ b/src/main/java/com/zy/api/controller/KopenApiController.java
@@ -9,14 +9,20 @@
import com.zy.api.entity.SyncMatParmas;
import com.zy.api.service.KopenApiService;
import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.util.List;
import java.util.Objects;
+
+
+@Slf4j
@RestController
@RequestMapping("/kopen")
public class KopenApiController {
@@ -54,14 +60,10 @@
*/
@ApiOperation("闆朵欢淇℃伅鏁版嵁鏇存柊")
@PostMapping("/sendPartsMaster")
- public R basMatUpdate(@RequestBody SyncMatParmas params) {
- if (Objects.isNull(params)) {
+ public R basMatUpdate(@RequestBody List<SyncMatParmas> params) {
+ if (Objects.isNull(params) || params.isEmpty()) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- if (Objects.isNull(params.getPro_komcode())) {
- return R.error("闆朵欢缂栫爜涓嶈兘涓虹┖锛侊紒");
- }
-
return kopenApiService.basMatupdate(params);
}
diff --git a/src/main/java/com/zy/api/enums/OrderWkType.java b/src/main/java/com/zy/api/enums/OrderWkType.java
index 900f974..d17d2a9 100644
--- a/src/main/java/com/zy/api/enums/OrderWkType.java
+++ b/src/main/java/com/zy/api/enums/OrderWkType.java
@@ -28,7 +28,7 @@
return OrderType.ORDER_IN.type;
} else if (val.equals(OrderWkType.ORDER_WK_BAG_IN.val)) {
return OrderType.ORDER_IN.type;
- } else if (val.equals(OrderWkType.ORDER_WK_ORDER_OUT.val) || val.equals(OrderWkType.ORDER_WK_ORDER_OUT.val) || val.equals(OrderWkType.ORDER_WK_ORDER_OUT.val)) {
+ } else if (val.equals(OrderWkType.ORDER_WK_ORDER_OUT_EO.val) || val.equals(OrderWkType.ORDER_WK_ORDER_OUT_SO.val) || val.equals(OrderWkType.ORDER_WK_ORDER_OUT.val)) {
return OrderType.ORDER_OUT.type;
} else {
return OrderType.ORDER_OUT.type;
diff --git a/src/main/java/com/zy/api/service/KopenApiService.java b/src/main/java/com/zy/api/service/KopenApiService.java
index a773a3c..74af3a5 100644
--- a/src/main/java/com/zy/api/service/KopenApiService.java
+++ b/src/main/java/com/zy/api/service/KopenApiService.java
@@ -1,5 +1,7 @@
package com.zy.api.service;
+import java.util.List;
+
import com.core.common.R;
import com.zy.api.entity.PubOrderParams;
import com.zy.api.entity.ReportOrderParam;
@@ -25,7 +27,7 @@
* @param matnrs
* @return com.core.common.R
*/
- R basMatupdate(SyncMatParmas matnrs);
+ R basMatupdate(List<SyncMatParmas> matnrs);
/**
diff --git a/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java b/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java
index ed6ff98..a92dc6b 100644
--- a/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java
@@ -184,46 +184,52 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public synchronized R basMatupdate(SyncMatParmas params) {
- if (Objects.isNull(params.getPro_komcode())) {
- return R.error("闆朵欢缂栫爜涓嶈兘涓虹┖锛侊紒");
+ public synchronized R basMatupdate(List<SyncMatParmas> params) {
+ if (Objects.isNull(params) || params.isEmpty()) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- Mat matnr = matService.selectOne(new EntityWrapper<Mat>().eq("matnr", params.getPro_komcode()));
- if (!Objects.isNull(matnr)) {
- // 璁㈠崟鏃堕棿
- if (Utils.isValidFormat(params.getUpdate_time(), "yyyy-MM-dd HH:mm:ss")) {
- Date date1 = Utils.getFormateDate(params.getUpdate_time());
- matnr.setUpdateTime(date1);
+ params.forEach(mats -> {
+ if (Objects.isNull(mats) ) {
+ throw new CoolException("鐗╂枡缂栫爜涓嶈兘涓虹┖锛侊紒");
}
- matnr.setMaktx(params.getPro_name());
- matnr.setSpecs(params.getPro_size());
- matnr.setWeight(Double.parseDouble(params.getPro_wet()));
- matnr.setSuppCode(params.getPro_id());
- matnr.setTagId(MatLocType.getTag(params.getPro_type()));
- matnr.setManu(params.getCompany_id());
- if (!matService.updateById(matnr)) {
- throw new CoolException("鐗╂枡鏇存柊澶辫触鎴栨棤闇�鏇存柊锛侊紒");
+ Mat matnr = matService.selectByMatnr(mats.getPro_komcode());
+ if (!Objects.isNull(matnr)) {
+ // 璁㈠崟鏃堕棿
+ if (Utils.isValidFormat(mats.getUpdate_time(), "yyyy-MM-dd HH:mm:ss")) {
+ Date date1 = Utils.getFormateDate(mats.getUpdate_time());
+ matnr.setUpdateTime(date1);
+ }
+ matnr.setMaktx(mats.getPro_name());
+ matnr.setSpecs(mats.getPro_size());
+ matnr.setWeight(Double.parseDouble(mats.getPro_wet()));
+ matnr.setSuppCode(mats.getPro_id());
+ matnr.setTagId(MatLocType.getTag(mats.getPro_type()));
+ matnr.setManu(mats.getCompany_id());
+ if (!matService.updateById(matnr)) {
+ throw new CoolException("鐗╂枡鏇存柊澶辫触鎴栨棤闇�鏇存柊锛侊紒");
+ }
+ } else {
+ if (Objects.isNull(matnr)) {
+ matnr = new Mat();
+ }
+ // 璁㈠崟鏃堕棿
+ if (Utils.isValidFormat(mats.getUpdate_time(), "yyyy-MM-dd HH:mm:ss")) {
+ Date date1 = Utils.getFormateDate(mats.getUpdate_time());
+ matnr.setUpdateTime(date1);
+ }
+ matnr.setMaktx(mats.getPro_name());
+ matnr.setMatnr(mats.getPro_komcode());
+ matnr.setSpecs(mats.getPro_size());
+ matnr.setWeight(Double.parseDouble(mats.getPro_wet()));
+ matnr.setSuppCode(mats.getPro_id());
+ matnr.setTagId(MatLocType.getTag(mats.getPro_type()));
+ matnr.setManu(mats.getCompany_id());
+ if (!matService.insert(matnr)) {
+ throw new CoolException("鐗╂枡鏇存柊澶辫触锛侊紒");
+ }
}
- } else {
- if (Objects.isNull(matnr)) {
- matnr = new Mat();
- }
- // 璁㈠崟鏃堕棿
- if (Utils.isValidFormat(params.getUpdate_time(), "yyyy-MM-dd HH:mm:ss")) {
- Date date1 = Utils.getFormateDate(params.getUpdate_time());
- matnr.setUpdateTime(date1);
- }
- matnr.setMaktx(params.getPro_name());
- matnr.setMatnr(params.getPro_komcode());
- matnr.setSpecs(params.getPro_size());
- matnr.setWeight(Double.parseDouble(params.getPro_wet()));
- matnr.setSuppCode(params.getPro_id());
- matnr.setTagId(MatLocType.getTag(params.getPro_type()));
- matnr.setManu(params.getCompany_id());
- if (!matService.insert(matnr)) {
- throw new CoolException("鐗╂枡鏇存柊澶辫触锛侊紒");
- }
- }
+ });
+
return R.ok("淇濆瓨鎴愬姛锛侊紒");
}
@@ -250,8 +256,7 @@
// 鍏ュ簱
order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no",
orderParams.getDispatch_no()));
- } else if
- (OrderType.ORDER_OUT.type.equals(OrderWkType.getTypeVal(params.getType()))) {
+ } else if (OrderType.ORDER_OUT.type.equals(OrderWkType.getTypeVal(params.getType()))) {
// 鍑哄簱
if (OrderWkType.ORDER_WK_ORDER_OUT.val.equals(params.getType())) {
// 澶囪揣鍗曞嚭搴�
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index beb9176..7018855 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -247,14 +247,14 @@
@TableField("appe_time")
private Date appeTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "骞舵澘鍑哄簱锛堢紦瀛樺尯AGV绔欑偣")
@TableField("pause_mk")
private String pauseMk;
- @ApiModelProperty("骞舵澘鍑哄簱锛堢紦瀛樺尯AGV绔欑偣锛�")
- @TableField(exist = false)
- private String avgSta;
+// @ApiModelProperty("骞舵澘鍑哄簱锛堢紦瀛樺尯AGV绔欑偣锛�")
+// @TableField(exist = false)
+// private String avgSta;
@ApiModelProperty(value= "")
@TableField("error_time")
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index e2eb19a..362f761 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -2230,7 +2230,8 @@
wrkMast.setStaNo(staDesc.getStnNo() + ""); // 鐩爣绔�
wrkMast.setSourceLocNo(locMast.getLocNo()); // 婧愬簱浣�
//灏忔澗椤圭洰锛岀紦瀛樺嚭搴揂GV绔欑偣锛岀敤浜庢竻绌虹紦瀛樺尯搴撳瓨
- wrkMast.setAvgSta(station.getDevNo());
+ wrkMast.setPauseMk(station.getDevNo());
+// wrkMast.setAvgSta(station.getDevNo());;
wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
wrkMast.setPicking("N"); // 鎷ｆ枡
wrkMast.setExitMk("N"); // 閫�鍑�
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 13d9382..d1d8539 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -1478,10 +1478,6 @@
if (wrkMast.getWrkSts() < 11 || wrkMast.getWrkSts() == 15) {
throw new CoolException("褰撳墠宸ヤ綔鐘舵�佹棤娉曡繘琛屾搷浣�");
}
- String agvSta = null;
- if (wrkMast.getIoType() == TaskIOType.MERGE_OUT.type) {
- agvSta = wrkMast.getAvgSta();
- }
// 淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。
// if (!wrkDetlLogService.save(wrkMast.getWrkNo())) {
@@ -1516,7 +1512,10 @@
throw new CoolException("鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬佸け璐�");
}
// 淇敼搴撲綅鐘舵�� Q.鎷ｆ枡/鐩樼偣/骞舵澘鍐嶅叆搴�
- LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getLocNo()));
+ if (Cools.isEmpty(locMast)) {
+ throw new CoolException("搴撲綅涓嶅瓨鍦�:" + wrkMast.getLocNo());
+ }
locMast.setLocSts("Q");
locMast.setAreaId(basAreas.getId());
locMast.setAreaName(basAreas.getName());
@@ -1527,19 +1526,7 @@
throw new CoolException("淇敼搴撲綅鐘舵�佸け璐�");
}
- // . 鍒犻櫎缂撳瓨绔欑偣鏄庣粏
- if (!Objects.isNull(agvSta)) {
- // 淇敼鐩爣绔欑偣淇℃伅
- BasStation station = basStationService.selectOne(new EntityWrapper<BasStation>().eq("dev_no", agvSta));
- if (Objects.isNull(station)) {
- throw new CoolException("绔欑偣涓嶅瓨鍦�!!");
- }
- basStationDetlService.delete(new EntityWrapper<BasStationDetl>().eq("dev_no", station.getDevNo()));
- station.setLocSts(LocStsType.LOC_STS_TYPE_O.type);
- if (!basStationService.updateById(station)) {
- throw new CoolException("绔欑偣鐘舵�佹洿鏂板け璐ワ紒锛�");
- }
- }
+
// .淇敼骞舵墭鍏ュ簱鏄庣粏鎵樼爜
List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>()
.eq("area_id", locMast.getAreaId())
@@ -1555,21 +1542,19 @@
}
// .淇敼浠诲姟妗ｆ槑缁嗘墭鐩樼爜
-
-
List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
if (!Objects.isNull(wrkDetls) && !wrkDetls.isEmpty()) {
- wrkDetls.forEach(wrkDetl -> {
- wrkDetl.setZpallet(wrkMast.getBarcode());
- wrkDetl.setBarcode(wrkMast.getBarcode());
- if (!wrkDetlService.updateById(wrkDetl)) {
+ for (WrkDetl wrkDetl : wrkDetls) {
+ wrkDetl.setZpallet(wrkMast.getBarcode());
+ wrkDetl.setBarcode(wrkMast.getBarcode());
+ if (!wrkDetlService.update(wrkDetl, new EntityWrapper<WrkDetl>()
+ .eq("matnr", wrkDetl.getMatnr())
+ .eq("standby1", wrkDetl.getStandby1())
+ .eq("wrk_no", wrkMast.getWrkNo()))) {
throw new CoolException("浠诲姟妗ｆ槑缁嗕慨鏀瑰け璐ワ紒锛�");
-
}
- });
+ }
}
-
-
}
@Override
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index 7313d18..43f85c0 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -6,6 +6,7 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.enums.LocAreaType;
import com.zy.asrs.enums.LocStsType;
+import com.zy.asrs.enums.TaskIOType;
import com.zy.asrs.service.*;
import com.zy.asrs.service.impl.*;
import com.zy.asrs.task.AbstractHandler;
@@ -424,6 +425,28 @@
+ wrkMast.getLocNo() + "]");
}
}
+
+ String agvSta = null;
+ if (wrkMast.getIoType() == TaskIOType.MERGE_OUT.type) {
+ agvSta = wrkMast.getPauseMk();
+ }
+
+ // . 鍒犻櫎缂撳瓨绔欑偣鏄庣粏
+ if (!Objects.isNull(agvSta)) {
+ // 淇敼鐩爣绔欑偣淇℃伅
+ BasStation station = basStationService.selectOne(new EntityWrapper<BasStation>().eq("dev_no", agvSta));
+ if (Objects.isNull(station)) {
+ throw new CoolException("绔欑偣涓嶅瓨鍦�!!");
+ }
+ basStationDetlService.delete(new EntityWrapper<BasStationDetl>().eq("dev_no", station.getDevNo()));
+ station.setLocSts(LocStsType.LOC_STS_TYPE_D.type);
+ if (!basStationService.updateById(station)) {
+ throw new CoolException("绔欑偣鐘舵�佹洿鏂板け璐ワ紒锛�");
+ }
+ }
+
+
+
break;
// 鐩樼偣鍏ュ簱
case 57:
diff --git a/src/main/webapp/static/js/basStation/basStation.js b/src/main/webapp/static/js/basStation/basStation.js
index 05c57bc..02384ea 100644
--- a/src/main/webapp/static/js/basStation/basStation.js
+++ b/src/main/webapp/static/js/basStation/basStation.js
@@ -26,6 +26,7 @@
, {field: 'decDesc', align: 'center', title: '璁惧鎻忚堪'}
, {field: 'area', align: 'center', title: '鍖哄煙'}
, {field: 'locSts$', align: 'center', title: '鐘舵��'}
+ , {field: 'barcode', align: 'center', title: '鎵樼洏鐮�'}
, {field: 'ioTime', align: 'center', title: '鍏ュ嚭搴撴椂闂�'}
, {field: 'modiUser$', align: 'center', title: '淇敼浜哄憳'}
, {field: 'modiTime$', align: 'center', title: '淇敼鏃堕棿'}
diff --git a/src/main/webapp/static/js/orderPakout/agvOut.js b/src/main/webapp/static/js/orderPakout/agvOut.js
index 9559cd2..bc6fdc3 100644
--- a/src/main/webapp/static/js/orderPakout/agvOut.js
+++ b/src/main/webapp/static/js/orderPakout/agvOut.js
@@ -236,7 +236,7 @@
if (tableCache[i].orderNo === stoPreTabData[j].orderNo
&& tableCache[i].matnr === stoPreTabData[j].matnr
&& tableCache[i].locNo === stoPreTabData[j].locNo) {
- tableCache[i]['staNo'] = batchSta;
+ tableCache[i]['agvStaNo'] = batchSta;
arr.push(i);
}
}
--
Gitblit v1.9.1