From f99e3966686d3891b814ff28d200b001fcdc8e1e Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期四, 05 二月 2026 12:54:26 +0800
Subject: [PATCH] 组托优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 77 ------------
rsf-admin/src/page/warehouseAreas/WarehouseAreasList.jsx | 1
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java | 152 ++++++++++++++++---------
rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsRcsServiceImpl.java | 14 +-
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 83 +++++++++++++
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java | 2
rsf-admin/src/page/basicInfo/matnr/PrintModal.jsx | 31 +++-
7 files changed, 208 insertions(+), 152 deletions(-)
diff --git a/rsf-admin/src/page/basicInfo/matnr/PrintModal.jsx b/rsf-admin/src/page/basicInfo/matnr/PrintModal.jsx
index 99d2114..4ae47d3 100644
--- a/rsf-admin/src/page/basicInfo/matnr/PrintModal.jsx
+++ b/rsf-admin/src/page/basicInfo/matnr/PrintModal.jsx
@@ -226,14 +226,6 @@
}
}))
setData(val)
- setTimeout(() => {
- val.forEach((el) => {
- jsbarcode(`#barcode${el.code}`, el.code, { height: 30 });
- });
- }, 10);
-
-
-
} else {
notify(res.data.msg);
}
@@ -243,8 +235,26 @@
if (rows?.length > 0) {
http();
}
-
}, [rows]);
+
+ // 鍦ㄦ暟鎹洿鏂板悗鐢熸垚鏉＄爜
+ useEffect(() => {
+ if (data.length > 0) {
+ // 绛夊緟DOM鏇存柊鍚庡啀鐢熸垚鏉＄爜
+ setTimeout(() => {
+ data.forEach((item) => {
+ const barcodeElement = document.getElementById(`barcode${item.code}`);
+ if (barcodeElement) {
+ try {
+ jsbarcode(`#barcode${item.code}`, item.code, { height: 30 });
+ } catch (error) {
+ console.error(`鐢熸垚鏉＄爜澶辫触: ${item.code}`, error);
+ }
+ }
+ });
+ }, 100);
+ }
+ }, [data]);
return (
@@ -275,8 +285,7 @@
colSpan={9}
style={{ border: '1px solid black' }}
>
- {/* <img id={"barcode" + item.code} style={{ width: '70%', verticalAlign: 'middle' }} /> */}
- <img className="template-code" src={item.barcode} style={{ width: '90%', verticalAlign: 'middle' }} alt="Barcode" />
+ <img id={`barcode${item.code}`} style={{ width: '90%', verticalAlign: 'middle' }} alt="Barcode" />
<div style={{ letterSpacing: '2px', marginTop: '1px', textAlign: 'center' }}>
<span>{item.code}</span>
</div>
diff --git a/rsf-admin/src/page/warehouseAreas/WarehouseAreasList.jsx b/rsf-admin/src/page/warehouseAreas/WarehouseAreasList.jsx
index 2ab6e3b..f53aa95 100644
--- a/rsf-admin/src/page/warehouseAreas/WarehouseAreasList.jsx
+++ b/rsf-admin/src/page/warehouseAreas/WarehouseAreasList.jsx
@@ -137,6 +137,7 @@
empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
filters={filters}
sort={{ field: "warehouseId", order: "desc" }}
+ // disableSyncWithLocation={false}
actions={(
<TopToolbar>
<FilterButton />
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsRcsServiceImpl.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsRcsServiceImpl.java
index 7429bb9..4cc19fe 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsRcsServiceImpl.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsRcsServiceImpl.java
@@ -335,7 +335,7 @@
*/
@Override
public CommonResponse reportTask(TaskReportParams params) {
- log.info("RCS鍥炶皟锛岃姹傚弬鏁帮細 {}", JSONObject.toJSONString(params));
+ log.info("浠诲姟鎵ц閫氱煡涓婃姤锛岃姹傚弬鏁帮細 {}", JSONObject.toJSONString(params));
// 鍙傛暟鏍￠獙
if (Objects.isNull(params)) {
@@ -362,20 +362,20 @@
// 灏嗕换鍔′笂鎶ュ洖璋冭浆鍙戝埌WMS绯荤粺
String callUrl = wmsApi.getHost() + ":" + wmsApi.getPort() + WmsConstant.callBack;
- log.info("RCS鍥炶皟锛岃姹傚湴鍧�锛� {}锛� 杞崲鍚庡弬鏁帮細 {}", callUrl, exMsgParams.toJSONString());
+ log.info("浠诲姟鎵ц閫氱煡涓婃姤锛岃姹傚湴鍧�锛� {}锛� 杞崲鍚庡弬鏁帮細 {}", callUrl, exMsgParams.toJSONString());
HttpHeaders headers = new HttpHeaders();
headers.add("Content-Type", "application/json");
headers.add("api-version", "v2.0");
HttpEntity httpEntity = new HttpEntity(exMsgParams, headers);
ResponseEntity<String> exchange = restTemplate.exchange(callUrl, HttpMethod.POST, httpEntity, String.class);
- log.info("RCS鍥炶皟锛屽搷搴旂粨鏋滐細 {}", exchange);
+ log.info("浠诲姟鎵ц閫氱煡涓婃姤锛屽搷搴旂粨鏋滐細 {}", exchange);
if (Objects.isNull(exchange.getBody())) {
// 濡傛灉鍥炶皟澶辫触锛岃繑鍥炴垚鍔熷搷搴旓紙閬垮厤RCS閲嶅鍥炶皟锛�
CommonResponse response = new CommonResponse();
response.setCode(200);
response.setMsg("鎺ユ敹鎴愬姛");
- log.warn("RCS鍥炶皟澶辫触锛屼絾杩斿洖鎴愬姛鍝嶅簲锛屼换鍔＄紪鍙凤細{}锛屾壒娆★細{}", params.getTaskNo(), params.getBatchNo());
+ log.warn("浠诲姟鎵ц閫氱煡涓婃姤鍥炶皟澶辫触锛屼絾杩斿洖鎴愬姛鍝嶅簲锛屼换鍔＄紪鍙凤細{}锛屾壒娆★細{}", params.getTaskNo(), params.getBatchNo());
return response;
} else {
ObjectMapper objectMapper = new ObjectMapper();
@@ -384,14 +384,14 @@
try {
CommonResponse result = objectMapper.readValue(exchange.getBody(), CommonResponse.class);
if (result.getCode() == 200) {
- log.info("RCS鍥炶皟涓婃姤鎴愬姛锛屼换鍔＄紪鍙凤細{}锛屾壒娆★細{}", params.getTaskNo(), params.getBatchNo());
+ log.info("浠诲姟鎵ц閫氱煡涓婃姤鎴愬姛锛屼换鍔＄紪鍙凤細{}锛屾壒娆★細{}", params.getTaskNo(), params.getBatchNo());
return result;
} else {
- log.warn("RCS鍥炶皟涓婃姤鍥炶皟杩斿洖闈�200鐘舵�侊紝浠诲姟缂栧彿锛歿}锛屾壒娆★細{}锛屽搷搴旓細{}", params.getTaskNo(), params.getBatchNo(), exchange.getBody());
+ log.warn("浠诲姟鎵ц閫氱煡涓婃姤鍥炶皟杩斿洖闈�200鐘舵�侊紝浠诲姟缂栧彿锛歿}锛屾壒娆★細{}锛屽搷搴旓細{}", params.getTaskNo(), params.getBatchNo(), exchange.getBody());
return result;
}
} catch (JsonProcessingException e) {
- log.error("RCS鍥炶皟涓婃姤鍥炶皟鍝嶅簲瑙ｆ瀽澶辫触锛屼换鍔＄紪鍙凤細{}锛屾壒娆★細{}锛岄敊璇細{}", params.getTaskNo(), params.getBatchNo(), e.getMessage());
+ log.error("浠诲姟鎵ц閫氱煡涓婃姤鍥炶皟鍝嶅簲瑙ｆ瀽澶辫触锛屼换鍔＄紪鍙凤細{}锛屾壒娆★細{}锛岄敊璇細{}", params.getTaskNo(), params.getBatchNo(), e.getMessage());
// 瑙ｆ瀽澶辫触鏃惰繑鍥炴垚鍔熷搷搴旓紝閬垮厤RCS閲嶅鍥炶皟
CommonResponse response = new CommonResponse();
response.setCode(200);
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
index c5c7240..ee5af53 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
@@ -582,6 +582,44 @@
throw new CoolException("璇疯嚦灏戣緭鍏ヤ竴涓煡璇㈡潯浠讹細鐗╂枡缂栫爜銆丄SN鍗曞彿銆佽窡韪爜銆佹壒娆℃垨绁ㄥ彿");
}
+ // 濡傛灉鎵弿鐗╂枡缂栫爜涓擜SN鍗曞彿涓虹┖锛岀洿鎺ヤ粠鐗╂枡淇℃伅琛ㄨ幏鍙栵紝涓嶆煡璇㈡敹璐у尯
+ if (!Cools.isEmpty(matnrCode) && Cools.isEmpty(asnCode) && Cools.isEmpty(code)
+ && Cools.isEmpty(batch) && Objects.isNull(fieldIndex)) {
+ logger.info("=== 浠庣墿鏂欎俊鎭〃鏌ヨ鐗╂枡淇℃伅锛堜笉鏌ヨ鏀惰揣鍖猴級 ===");
+ logger.info("鏌ヨ鍙傛暟 - matnrCode: {}", matnrCode);
+
+ Matnr matnr = matnrMapper.selectOne(new LambdaQueryWrapper<Matnr>()
+ .eq(Matnr::getCode, matnrCode)
+ .eq(Matnr::getDeleted, 0)
+ .last("LIMIT 1"));
+
+ if (matnr == null) {
+ logger.warn("鐗╂枡淇℃伅琛ㄤ腑鏈壘鍒扮墿鏂欑紪鐮�: {}", matnrCode);
+ return R.ok(new ArrayList<>());
+ }
+
+ // 鏋勯�犱竴涓櫄鎷熺殑 WarehouseAreasItem 瀵硅薄杩斿洖鐗╂枡淇℃伅
+ WarehouseAreasItem item = new WarehouseAreasItem();
+ item.setMatnrId(matnr.getId());
+ item.setMatnrCode(matnr.getCode());
+ item.setMaktx(matnr.getName());
+ item.setStockUnit(matnr.getStockUnit());
+ item.setUnit(matnr.getUnit());
+ item.setAnfme(0.0); // 鏁伴噺璁句负0锛屽洜涓轰笉鏄粠鏀惰揣鍖烘煡璇㈢殑
+ item.setWorkQty(0.0);
+ item.setQty(0.0);
+
+ // 璁剧疆鎵╁睍瀛楁
+ Map<String, String> fields = FieldsUtils.getFields(matnr.getFieldsIndex());
+ item.setExtendFields(fields);
+
+ List<WarehouseAreasItem> resultList = new ArrayList<>();
+ resultList.add(item);
+
+ logger.info("浠庣墿鏂欎俊鎭〃杩斿洖 1 鏉＄墿鏂欐暟鎹�");
+ return R.ok(resultList);
+ }
+
//TODO 鍚庣画闇�鏍规嵁绛栫暐閰嶇疆锛岃幏鍙栫粍鎷栨暟鎹�傚锛氭贩瑁咃紝鎸夋壒娆℃贩瑁呯瓑
LambdaQueryWrapper<WarehouseAreasItem> queryWrapper = new LambdaQueryWrapper<>();
@@ -685,6 +723,51 @@
logger.warn("鏁版嵁搴撴煡璇㈢粨鏋滀负绌猴紝鍙兘鍘熷洜锛�1.鐗╂枡缂栫爜涓嶅尮閰� 2.鐗╂枡鏈敹璐ц嚦鏀惰揣鍖� 3.鏁版嵁宸茶鍒犻櫎");
}
+ // 濡傛灉鎵弿鐗╂枡缂栫爜鍔犺浇鐗╂枡骞朵笖ASN鍗曞彿涓虹┖鏃讹紝浠庣墿鏂欎俊鎭〃鑾峰彇鐗╂枡淇℃伅骞舵洿鏂�
+ if (!Cools.isEmpty(matnrCode) && Cools.isEmpty(asnCode) && !list.isEmpty()) {
+ // 鏀堕泦鎵�鏈夊敮涓�鐨勭墿鏂欑紪鐮�
+ Set<String> matnrCodes = list.stream()
+ .map(WarehouseAreasItem::getMatnrCode)
+ .filter(matCode -> !Cools.isEmpty(matCode))
+ .collect(Collectors.toSet());
+
+ // 鎵归噺鏌ヨ鐗╂枡淇℃伅
+ if (!matnrCodes.isEmpty()) {
+ Map<String, Matnr> matnrMap = new HashMap<>();
+ for (String matCode : matnrCodes) {
+ Matnr matnr = matnrMapper.selectOne(new LambdaQueryWrapper<Matnr>()
+ .eq(Matnr::getCode, matCode)
+ .eq(Matnr::getDeleted, 0)
+ .last("LIMIT 1"));
+ if (matnr != null) {
+ matnrMap.put(matCode, matnr);
+ }
+ }
+
+ // 鏇存柊鍒楄〃涓殑鐗╂枡淇℃伅
+ list.forEach(item -> {
+ String itemMatnrCode = item.getMatnrCode();
+ if (!Cools.isEmpty(itemMatnrCode) && matnrMap.containsKey(itemMatnrCode)) {
+ Matnr matnr = matnrMap.get(itemMatnrCode);
+ // 浠庣墿鏂欎俊鎭〃鏇存柊鐗╂枡鍚嶇О
+ if (!Cools.isEmpty(matnr.getName())) {
+ item.setMaktx(matnr.getName());
+ }
+ // 浠庣墿鏂欎俊鎭〃鏇存柊搴撳瓨鍗曚綅
+ if (!Cools.isEmpty(matnr.getStockUnit())) {
+ item.setStockUnit(matnr.getStockUnit());
+ }
+ // 浠庣墿鏂欎俊鎭〃鏇存柊鍗曚綅
+ if (!Cools.isEmpty(matnr.getUnit())) {
+ item.setUnit(matnr.getUnit());
+ }
+ logger.debug("宸蹭粠鐗╂枡淇℃伅琛ㄦ洿鏂扮墿鏂欎俊鎭� - matnrCode: {}, name: {}, stockUnit: {}",
+ itemMatnrCode, matnr.getName(), matnr.getStockUnit());
+ }
+ });
+ }
+ }
+
list.forEach(item -> {
Map<String, String> fields = FieldsUtils.getFields(item.getFieldsIndex());
item.setExtendFields(fields);
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java
index 5a7939a..a014e06 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java
@@ -581,7 +581,7 @@
log.warn("鏈鐞嗙殑浜嬩欢绫诲瀷 - 浜嬩欢绫诲瀷锛歿}锛屼换鍔＄紪鐮侊細{}锛屼换鍔＄被鍨嬶細{}",
params.getEventType(), task.getTaskCode(), task.getTaskType());
}
- log.info("========== RCS鍥炶皟澶勭悊瀹屾垚 ==========");
+ log.info("========== 浠诲姟鎵ц閫氱煡涓婃姤澶勭悊瀹屾垚 ==========");
log.info("澶勭悊缁撴灉锛歿}", JSONObject.toJSONString(params));
return R.ok(JSONObject.toJSONString(params));
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
index adcbecd..d653a6a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
@@ -462,9 +462,6 @@
if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type)) {
//1.鍏ュ簱
complateInstock(task, loginUserId);
- } else if (task.getTaskType().equals(TaskType.TASK_TYPE_EMPITY_IN.type)) {
- //10.绌烘墭鍏ュ簱
- complateEmpityInStock(task, loginUserId);
} else if (task.getTaskType().equals(TaskType.TASK_TYPE_PICK_IN.type) || task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_IN.type)) {
//53.鎷ｆ枡鍐嶅叆搴�
//57.鐩樼偣鍐嶅叆搴�
@@ -1797,80 +1794,6 @@
.set(WaitPakin::getUpdateBy, loginUserId)
.in(WaitPakin::getId, pakinIds))) {
throw new CoolException("缁勬嫋鐘舵�佷慨鏀瑰け璐ワ紒锛�");
- }
-
- /**淇敼搴撲綅鐘舵�佷负F.鍦ㄥ簱*/
- if (!locService.update(new LambdaUpdateWrapper<Loc>().set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_F.type).eq(Loc::getCode, task.getTargLoc()))) {
- throw new CoolException("搴撲綅鐘舵�佷慨鏀瑰け璐ワ紒锛�");
- }
- if (!this.update(new LambdaUpdateWrapper<Task>().eq(Task::getId, task.getId()).set(Task::getTaskStatus, TaskStsType.UPDATED_IN.id))) {
- throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
- }
- }
-
- /**
- * 绌烘墭鍏ュ簱瀹屾垚
- *
- * @param task
- * @param loginUserId
- */
- @Transactional(rollbackFor = Exception.class)
- public synchronized void complateEmpityInStock(Task task, Long loginUserId) {
- if (Objects.isNull(task)) {
- return;
- }
-
- Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, task.getTargLoc()));
- if (Objects.isNull(loc)) {
- throw new CoolException("鐩爣搴撲綅涓嶅瓨鍦紒");
- }
-
- if (!loc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_S.type)) {
- throw new CoolException("褰撳墠搴撲綅鐘舵�佷笉澶勪簬S.鍏ュ簱棰勭害锛屼笉鍙墽琛屽叆搴撴搷浣滐紒");
- }
-
- List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
- if (taskItems.isEmpty()) {
- throw new CoolException("浠诲姟鏄庣粏涓嶅瓨鍦紒锛�");
- }
-
- //鏇存柊搴撲綅鏄庣粏
- saveLocItem(taskItems, task.getId(), loginUserId);
-
- //绌烘墭鍏ュ簱涓嶆牎楠岀粍鎵樹俊鎭紝鐩存帴澶勭悊浠诲姟鏄庣粏
- //濡傛灉鏈変换鍔℃槑缁嗗叧鑱斾簡缁勬墭锛屼篃闇�瑕佷繚瀛樺叆鍑哄簱鏄庣粏鍜岀Щ鍑烘敹璐у尯搴撳瓨
- Map<Long, List<TaskItem>> orderMap = taskItems.stream().collect(Collectors.groupingBy(TaskItem::getSource));
- orderMap.keySet().forEach(key -> {
- // 濡傛灉source涓嶄负绌猴紝璇存槑鏈夊叧鑱旂殑缁勬墭鏄庣粏锛岄渶瑕佸鐞�
- if (key != null && key > 0) {
- WaitPakinItem pakinItem = waitPakinItemService.getById(key);
- if (!Objects.isNull(pakinItem)) {
- List<TaskItem> items = orderMap.get(key);
- //淇濆瓨鍏ュ嚭搴撴槑缁�
- saveStockItems(items, task, pakinItem.getId(), pakinItem.getAsnCode(), pakinItem.getWkType(), pakinItem.getType(), loginUserId);
- //绉诲嚭鏀惰揣鍖哄簱瀛橈紝 淇敼缁勬墭鐘舵��
- removeReceiptStock(pakinItem, loginUserId);
- }
- }
- });
-
- // 澶勭悊缁勬墭鐘舵�侊紙濡傛灉鏈夌粍鎵樺叧鑱旓級
- Set<Long> pkinItemIds = taskItems.stream()
- .map(TaskItem::getSource)
- .filter(source -> source != null && source > 0)
- .collect(Collectors.toSet());
-
- if (!pkinItemIds.isEmpty()) {
- List<WaitPakinItem> pakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>().in(WaitPakinItem::getId, pkinItemIds));
- if (!pakinItems.isEmpty()) {
- Set<Long> pakinIds = pakinItems.stream().map(WaitPakinItem::getPakinId).collect(Collectors.toSet());
- if (!waitPakinService.update(new LambdaUpdateWrapper<WaitPakin>()
- .set(WaitPakin::getIoStatus, PakinIOStatus.PAKIN_IO_STATUS_TASK_DONE.val)
- .set(WaitPakin::getUpdateBy, loginUserId)
- .in(WaitPakin::getId, pakinIds))) {
- throw new CoolException("缁勬嫋鐘舵�佷慨鏀瑰け璐ワ紒锛�");
- }
- }
}
/**淇敼搴撲綅鐘舵�佷负F.鍦ㄥ簱*/
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
index 0dc85d7..a4af675 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
@@ -8,6 +8,7 @@
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.PakinIOStatus;
import com.vincent.rsf.server.manager.mapper.WaitPakinMapper;
+import com.vincent.rsf.server.manager.mapper.MatnrMapper;
import com.vincent.rsf.server.manager.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
@@ -41,6 +42,8 @@
private TaskService taskService;
@Autowired
private TaskItemService taskItemService;
+ @Autowired
+ private MatnrMapper matnrMapper;
/**
@@ -63,34 +66,22 @@
WaitPakin pakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>()
.eq(WaitPakin::getBarcode, waitPakin.getBarcode()));
+ // 濡傛灉瀹瑰櫒鍙峰凡缁忕粍鎵樿繃锛屾彁绀哄凡缁勬墭锛岃鏇存崲瀹瑰櫒鏉＄爜
+ if (!Objects.isNull(pakin)) {
+ throw new CoolException("宸茬粍鎵橈紝璇锋洿鎹㈠鍣ㄦ潯鐮�");
+ }
+
List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, waitPakin.getBarcode()));
if (!tasks.isEmpty()) {
throw new CoolException("褰撳墠鎵樼洏宸叉湁浠诲姟妗ｅ湪鎵ц锛屼笉鑳藉啀娆＄粍鎵橈紒锛�");
}
- if (!Objects.isNull(pakin)) {
- List<WaitPakinItem> waitPakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>().eq(!Objects.isNull(pakin.getId()) ,WaitPakinItem::getPakinId, pakin.getId()));
- waitPakinItems.forEach(item -> {
- for (PakinItem pakinItem : waitPakin.getItems()) {
- WarehouseAreasItem warehouseAreasItems = warehouseAreasItemService.getById(pakinItem.getId());
- if (Objects.isNull(warehouseAreasItems)) {
- throw new CoolException("鐗╂枡鏈�佽嚦鏀惰揣鍖烘垨宸茬粍鎵樺畬鎴愮Щ鍑烘敹璐у尯锛侊紒");
- }
- // 鍙湪绁ㄥ彿涓嶄负绌烘椂鎵嶈繘琛岄噸澶嶆鏌�
- if (!Objects.isNull(item.getFieldsIndex()) && !Objects.isNull(warehouseAreasItems.getFieldsIndex())
- && item.getFieldsIndex().equals(warehouseAreasItems.getFieldsIndex())) {
- String crushNo = item.getExtendFields() != null ? item.getExtendFields().get("crushNo") : "";
- throw new CoolException("绁ㄥ彿锛�" + crushNo + "宸茬粍鎵橈紝涓嶅彲閲嶅缁勬墭锛侊紒");
- }
- }
- });
- }
-
+
+ // 妫�鏌ュ鍣ㄥ彿鏄惁鍦ㄥ簱瀛樹腑瀛樺湪锛堥�氳繃搴撲綅琛ㄦ煡璇級
List<Loc> locs = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getBarcode, waitPakin.getBarcode()));
if (!locs.isEmpty()) {
- List<String> locCodes = locs.stream().map(Loc::getCode).collect(Collectors.toList());
- String join = StringUtils.join(locCodes, ",");
- throw new CoolException("鎵樼洏鐮侊細" + waitPakin.getBarcode() + "宸茶搴撲綅锛�" + join + "浣跨敤锛侊紒");
+ throw new CoolException("鍦ㄥ簱锛岃鏇存崲瀹瑰櫒鏉＄爜");
}
+
double sum = waitPakin.getItems().stream().mapToDouble(PakinItem::getReceiptQty).sum();
WaitPakin waitPakin1 = new WaitPakin();
@@ -115,46 +106,90 @@
List<WaitPakinItem> items = new ArrayList<>();
for (PakinItem pakinItem1 : waitPakin.getItems()) {
- //涓嶈壇鏍囩缁勬墭
- WarehouseAreasItem warehouseAreasItems = warehouseAreasItemService.getById(pakinItem1.getId());
- if (null == warehouseAreasItems) {
- throw new CoolException("鐗╂枡鏈�佽嚦鏀惰揣鍖猴紒锛�");
- }
WaitPakinItem pakinItem = new WaitPakinItem();
- pakinItem.setAnfme(warehouseAreasItems.getAnfme())
- .setPakinId(waitPakin1.getId())
- .setSource(warehouseAreasItems.getId())
- .setAsnId(warehouseAreasItems.getAsnId())
- .setAsnCode(warehouseAreasItems.getAsnCode())
- .setAsnItemId(warehouseAreasItems.getAsnItemId())
- .setIsptResult(warehouseAreasItems.getIsptResult())
- .setPlatItemId(warehouseAreasItems.getPlatItemId())
- .setPlatOrderCode(warehouseAreasItems.getPlatOrderCode())
- .setPlatWorkCode(warehouseAreasItems.getPlatWorkCode())
- .setProjectCode(warehouseAreasItems.getProjectCode())
- .setBatch(warehouseAreasItems.getSplrBatch())
- .setUnit(warehouseAreasItems.getStockUnit())
- .setFieldsIndex(warehouseAreasItems.getFieldsIndex())
- .setMatnrId(warehouseAreasItems.getMatnrId())
- .setMaktx(warehouseAreasItems.getMaktx())
- .setUpdateBy(userId)
- .setCreateBy(userId)
- .setMatnrCode(warehouseAreasItems.getMatnrCode());
- WkOrder order = asnOrderService.getById(warehouseAreasItems.getAsnId());
- if (!Objects.isNull(order)) {
- pakinItem.setType(null == order.getType() ? null : order.getType())
- .setWkType(null == order.getWkType() ? null : Short.parseShort(order.getWkType()));
- }
+
+ // 濡傛灉ASN鍗曞彿涓虹┖锛屼粠鐗╂枡淇℃伅琛ㄨ幏鍙栫墿鏂欎俊鎭紝涓嶆煡璇㈡敹璐у尯
+ if (StringUtils.isBlank(pakinItem1.getAsnCode())) {
+ if (Objects.isNull(pakinItem1.getMatnrId())) {
+ throw new CoolException("鐗╂枡ID涓嶈兘涓虹┖锛侊紒");
+ }
+
+ // 浠庣墿鏂欎俊鎭〃鑾峰彇鐗╂枡淇℃伅
+ Matnr matnr = matnrMapper.selectById(pakinItem1.getMatnrId());
+ if (Objects.isNull(matnr)) {
+ throw new CoolException("鐗╂枡淇℃伅涓嶅瓨鍦紝鐗╂枡ID锛�" + pakinItem1.getMatnrId());
+ }
+
+ // 璁剧疆缁勬墭鏄庣粏淇℃伅锛堜笉璁剧疆source锛屽洜涓轰笉鍦ㄦ敹璐у尯锛�
+ pakinItem.setPakinId(waitPakin1.getId())
+ .setSource(null) // 涓嶅湪鏀惰揣鍖猴紝source璁句负null
+ .setAsnId(null)
+ .setAsnCode(null)
+ .setAsnItemId(null)
+ .setIsptResult(null)
+ .setPlatItemId(null)
+ .setPlatOrderCode(null)
+ .setPlatWorkCode(null)
+ .setProjectCode(null)
+ .setBatch(null)
+ .setUnit(matnr.getStockUnit())
+ .setFieldsIndex(matnr.getFieldsIndex())
+ .setMatnrId(matnr.getId())
+ .setMaktx(matnr.getName())
+ .setUpdateBy(userId)
+ .setCreateBy(userId)
+ .setMatnrCode(matnr.getCode());
+
+ // 璁剧疆缁勬墭鏁伴噺
+ if (pakinItem1.getReceiptQty() == null || pakinItem1.getReceiptQty().compareTo(0.0) <= 0) {
+ throw new CoolException("缁勬墭鏁伴噺涓嶈兘灏忎簬绛変簬闆讹紒锛�");
+ }
+ pakinItem.setAnfme(pakinItem1.getReceiptQty())
+ .setTrackCode(pakinItem1.getTrackCode());
+ } else {
+ // 鏈堿SN鍗曞彿锛屼粠鏀惰揣鍖鸿幏鍙栫墿鏂欎俊鎭�
+ WarehouseAreasItem warehouseAreasItems = warehouseAreasItemService.getById(pakinItem1.getId());
+ if (null == warehouseAreasItems) {
+ throw new CoolException("鐗╂枡鏈�佽嚦鏀惰揣鍖猴紒锛�");
+ }
+
+ pakinItem.setAnfme(warehouseAreasItems.getAnfme())
+ .setPakinId(waitPakin1.getId())
+ .setSource(warehouseAreasItems.getId())
+ .setAsnId(warehouseAreasItems.getAsnId())
+ .setAsnCode(warehouseAreasItems.getAsnCode())
+ .setAsnItemId(warehouseAreasItems.getAsnItemId())
+ .setIsptResult(warehouseAreasItems.getIsptResult())
+ .setPlatItemId(warehouseAreasItems.getPlatItemId())
+ .setPlatOrderCode(warehouseAreasItems.getPlatOrderCode())
+ .setPlatWorkCode(warehouseAreasItems.getPlatWorkCode())
+ .setProjectCode(warehouseAreasItems.getProjectCode())
+ .setBatch(warehouseAreasItems.getSplrBatch())
+ .setUnit(warehouseAreasItems.getStockUnit())
+ .setFieldsIndex(warehouseAreasItems.getFieldsIndex())
+ .setMatnrId(warehouseAreasItems.getMatnrId())
+ .setMaktx(warehouseAreasItems.getMaktx())
+ .setUpdateBy(userId)
+ .setCreateBy(userId)
+ .setMatnrCode(warehouseAreasItems.getMatnrCode());
+
+ WkOrder order = asnOrderService.getById(warehouseAreasItems.getAsnId());
+ if (!Objects.isNull(order)) {
+ pakinItem.setType(null == order.getType() ? null : order.getType())
+ .setWkType(null == order.getWkType() ? null : Short.parseShort(order.getWkType()));
+ }
- for (PakinItem waitPakinItem : waitPakin.getItems()) {
- if (waitPakinItem.getId().equals(warehouseAreasItems.getId())) {
- if (waitPakinItem.getReceiptQty() > warehouseAreasItems.getAnfme() || waitPakinItem.getReceiptQty().compareTo(0.0) <= 0) {
- throw new CoolException("缁勬墭鏁伴噺涓嶈兘澶т簬鏀惰揣鏁伴噺涓斾笉鑳藉皬浜庨浂锛侊紒");
+ for (PakinItem waitPakinItem : waitPakin.getItems()) {
+ if (waitPakinItem.getId().equals(warehouseAreasItems.getId())) {
+ if (waitPakinItem.getReceiptQty() > warehouseAreasItems.getAnfme() || waitPakinItem.getReceiptQty().compareTo(0.0) <= 0) {
+ throw new CoolException("缁勬墭鏁伴噺涓嶈兘澶т簬鏀惰揣鏁伴噺涓斾笉鑳藉皬浜庨浂锛侊紒");
+ }
+ pakinItem.setAnfme(waitPakinItem.getReceiptQty())
+ .setTrackCode(waitPakinItem.getTrackCode());
}
- pakinItem.setAnfme(waitPakinItem.getReceiptQty())
- .setTrackCode(waitPakinItem.getTrackCode());
}
}
+
items.add(pakinItem);
}
@@ -170,6 +205,11 @@
// Double total = Math.round((sum + waitSum) * 100) / 100.0;
for (WaitPakinItem pakinItem : items) {
+ // 濡傛灉source涓虹┖锛堟病鏈堿SN鍗曞彿锛屼笉鍦ㄦ敹璐у尯锛夛紝璺宠繃鏀惰揣鍖烘洿鏂�
+ if (Objects.isNull(pakinItem.getSource())) {
+ continue;
+ }
+
WarehouseAreasItem one = warehouseAreasItemService.getOne(new LambdaQueryWrapper<WarehouseAreasItem>()
.eq(WarehouseAreasItem::getId, pakinItem.getSource()));
if (Objects.isNull(one)) {
--
Gitblit v1.9.1