From 7f9fa6378436a22a6b7df8c8ddb3af83f42c7d8b Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 30 四月 2025 13:40:11 +0800
Subject: [PATCH] #优化修改 1. 再次收货，先收货30再次收货30累加才对 2. 批次号整个流程走不通 3. 任务工作档排序，最新的永远在最上面
---
rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemCreate.jsx | 2 +-
rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemPanel.jsx | 2 +-
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasItemController.java | 10 +++++++++-
rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java | 2 +-
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java | 1 +
rsf-admin/src/i18n/zh.js | 13 ++++++-------
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 11 +++++++----
rsf-admin/src/i18n/en.js | 2 ++
rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx | 6 ++++--
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/MobileController.java | 2 +-
10 files changed, 33 insertions(+), 18 deletions(-)
diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index 0f6f391..d569c3d 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -353,6 +353,8 @@
fieldsIndex: "fieldsIndex",
barcode: "barcode",
anfme: "anfme",
+ workQty: 'Work Qty',
+ qty: 'Available',
batch: "batch",
unit: "unit",
stockUnit: "stockUnit",
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index b43ff5f..509be24 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -158,10 +158,10 @@
fieldsItem: '鎵╁睍瀛楁鏄庣粏',
warehouseAreasItem: '搴撳尯搴撳瓨淇℃伅',
deviceSite: '璺緞绠＄悊',
- waitPakin: '缁勬嫋閫氱煡妗�',
- waitPakinItem: '缁勬嫋妗ｆ槑缁�',
- waitPakinLog: '缁勬嫋鍘嗗彶妗�',
- waitPakinItemLog: '缁勬嫋鍘嗗彶妗ｆ槑缁�',
+ waitPakin: '缁勬墭閫氱煡妗�',
+ waitPakinItem: '缁勬墭妗ｆ槑缁�',
+ waitPakinLog: '缁勬墭鍘嗗彶妗�',
+ waitPakinItemLog: '缁勬墭鍘嗗彶妗ｆ槑缁�',
task: '浠诲姟宸ヤ綔妗�',
taskItem: '浠诲姟妗ｆ槑缁�',
taskLog: '浠诲姟鍘嗗彶妗�',
@@ -353,6 +353,8 @@
matnrName: "鐗╂枡鍚嶇О",
matnrCode: "鐗╂枡缂栫爜",
fieldsIndex: "鎵╁睍瀛楁鍞竴鏍囪瘑",
+ workQty: '涓婃灦涓�',
+ qty: '宸插畬鎴�',
barcode: "鏉″舰鐮�",
anfme: "鏁伴噺",
batch: "鎵规鍙�",
@@ -907,9 +909,6 @@
matnrCode: "鐗╂枡缂栫爜",
trackCode: "璺熻釜鐮�",
workQty: '鎵ц鏁�',
- qty: '鎬绘暟閲�',
- unit: "鍗曚綅",
- anfme: "鏁伴噺",
batch: "鎵规",
splrBatch: "渚涘簲鍟嗘壒娆�",
spec: "瑙勬牸",
diff --git a/rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemCreate.jsx b/rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemCreate.jsx
index 2c63e6d..c96ebb4 100644
--- a/rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemCreate.jsx
+++ b/rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemCreate.jsx
@@ -195,7 +195,7 @@
<Grid item xs={6} display="flex" gap={1}>
<TextInput
label="table.field.warehouseAreasItem.splrBtch"
- source="splrBtch"
+ source="splrBatch"
parse={v => v}
/>
</Grid>
diff --git a/rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx b/rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx
index e3e7a1f..b953009 100644
--- a/rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx
+++ b/rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx
@@ -127,7 +127,7 @@
preferenceKey='warehouseAreasItem'
bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
rowClick={(id, resource, record) => false}
- omit={['id', 'createTime', 'createBy', 'memo', 'areaId', 'matnrId', 'batch', 'shipperId', 'splrId']}
+ omit={['id', 'createTime', 'memo', 'areaId', 'brand', 'createBy$', 'weight', 'matnrId', 'batch', 'shipperId', 'splrId']}
>
<NumberField source="id" />
<NumberField source="areaId" label="table.field.warehouseAreasItem.areaId" />
@@ -137,6 +137,9 @@
<TextField source="matnrCode" label="table.field.warehouseAreasItem.matnrCode" />
<TextField source="trackCode" label="table.field.warehouseAreasItem.barcode" />
<NumberField source="anfme" label="table.field.warehouseAreasItem.anfme" />
+ <NumberField source="workQty" label="table.field.warehouseAreasItem.workQty" />
+ <NumberField source="qty" label="table.field.warehouseAreasItem.qty" />
+ <TextField source="splrBatch" label="table.field.warehouseAreasItem.splrBtch" />
<TextField source="batch" label="table.field.warehouseAreasItem.batch" />
<TextField source="unit" label="table.field.warehouseAreasItem.unit" />
<TextField source="stockUnit" label="table.field.warehouseAreasItem.stockUnit" />
@@ -145,7 +148,6 @@
<TextField source="splrId" label="table.field.warehouseAreasItem.splrId" />
<NumberField source="weight" label="table.field.warehouseAreasItem.weight" />
<TextField source="prodTime" label="table.field.warehouseAreasItem.prodTime" />
- <TextField source="splrBtch" label="table.field.warehouseAreasItem.splrBtch" />
<TextField source="updateBy$" label="common.field.updateBy" />
<DateField source="updateTime" label="common.field.updateTime" showTime />
<TextField source="createBy$" label="common.field.createBy" />
diff --git a/rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemPanel.jsx b/rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemPanel.jsx
index 704e7f0..417d2ee 100644
--- a/rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemPanel.jsx
+++ b/rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemPanel.jsx
@@ -133,7 +133,7 @@
<Grid item xs={6}>
<PanelTypography
title="table.field.warehouseAreasItem.splrBtch"
- property={record.splrBtch}
+ property={record.splrBatch}
/>
</Grid>
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/MobileController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/MobileController.java
index eed0ce4..d9de613 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/MobileController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/MobileController.java
@@ -84,7 +84,7 @@
if (Objects.isNull(params)) {
throw new CoolException("璇锋眰鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- return mobileService.receiptToWarehouse(params);
+ return mobileService.receiptToWarehouse(params, getLoginUserId());
}
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java
index 8fcb6d3..121003c 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java
@@ -26,7 +26,7 @@
R getOrderByCode(String barcode);
- R receiptToWarehouse(Map<String, Object> orders);
+ R receiptToWarehouse(Map<String, Object> orders, Long loginUserId);
R otherReceipt(OtherReceiptParams params);
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 33a6fb9..688e1a5 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
@@ -183,15 +183,16 @@
}
/**
+ * @param params
+ * @param loginUserId
+ * @return
* @author Ryan
* @description 鏀惰揣鑷虫敹璐у尯
- * @param params
- * @return
* @time 2025/3/10 15:41
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public R receiptToWarehouse(Map<String, Object> params) {
+ public R receiptToWarehouse(Map<String, Object> params, Long loginUserId) {
if (Objects.isNull(params)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
@@ -234,7 +235,7 @@
}
List<Map<String, Object>> receipts1 = (List<Map<String, Object>>) params.get("receipts");
for (Map<String, Object> rcpt : receipts1) {
- if (Objects.isNull(rcpt)) {continue;}
+ if (null == rcpt || Objects.isNull(rcpt)) {continue;}
ReceiptDetlsDto dto = JSONObject.parseObject(JSONObject.toJSONString(rcpt), ReceiptDetlsDto.class);
Matnr matnr = matnrMapper.selectById(dto.getMatnrId());
if (Objects.isNull(matnr)) {
@@ -300,6 +301,8 @@
.setAnfme(dto.getReceiptQty())
.setSplrBatch(dto.getSplrBatch())
.setMatnrCode(matnr.getCode())
+ .setUpdateBy(loginUserId)
+ .setCreateBy(loginUserId)
.setMatnrId(matnr.getId())
.setMaktx(matnr.getName())
//搴撳瓨鍗曚綅涓烘渶灏忓崟浣�
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasItemController.java
index 2f58dc3..ac79f29 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasItemController.java
@@ -1,6 +1,7 @@
package com.vincent.rsf.server.manager.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
@@ -32,7 +33,14 @@
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<WarehouseAreasItem, BaseParam> pageParam = new PageParam<>(baseParam, WarehouseAreasItem.class);
- return R.ok().add(warehouseAreasItemService.page(pageParam, pageParam.buildWrapper(true)));
+ QueryWrapper<WarehouseAreasItem> queryWrapper = pageParam.buildWrapper(true);
+ queryWrapper.select( "id","area_id","area_name","asn_id","plat_item_id","po_code",
+ "asn_code", "asn_item_id","matnr_id","maktx","matnr_code","fields_index","track_code",
+ "SUM(anfme) anfme","SUM(work_qty) work_qty","ispt_result","SUM(qty) qty", "splr_batch","batch","unit","stock_unit",
+ "brand","shipper_id","splr_id","weight","prod_time","`status`", "create_by",
+ "create_time","update_by","update_time","memo");
+ queryWrapper.groupBy("matnr_code", "splr_batch", "track_code");
+ return R.ok().add(warehouseAreasItemService.page(pageParam, queryWrapper));
}
@PreAuthorize("hasAuthority('manager:warehouseAreasItem:list')")
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 ee36323..e34df99 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
@@ -109,6 +109,7 @@
}
}
List<WaitPakinItem> items = new ArrayList<>();
+ //涓嶈壇鏍囩缁勬墭
if (!Objects.isNull(waitPakin.getType()) && waitPakin.getType().equals("defective")) {
List<AsnOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().in(AsnOrderItem::getTrackCode, tracks));
if (Objects.isNull(orderItems) || orderItems.isEmpty()) {
--
Gitblit v1.9.1