From d3c44bb9a25c42bba6e2dfd85ac7d04863112dc8 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 30 四月 2025 10:48:38 +0800
Subject: [PATCH] 收货单改入修改 单位带入修改
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java | 2 +-
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java | 8 ++++----
rsf-admin/src/page/orders/asnOrder/AsnWareModal.jsx | 14 +++++---------
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java | 8 +++-----
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java | 4 ++--
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderItemService.java | 2 +-
rsf-admin/src/i18n/zh.js | 1 +
rsf-admin/src/i18n/en.js | 1 +
rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx | 2 +-
9 files changed, 19 insertions(+), 23 deletions(-)
diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index 199d83f..0f6f391 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -578,6 +578,7 @@
stockUnit: "stockUnit",
purQty: "purQty",
purUnit: "purUnit",
+ unit: 'Unit',
qty: "qty",
splrCode: "splrCode",
splrName: "splrName",
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index f229ecc..46cf94f 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -568,6 +568,7 @@
stockUnit: "搴撳瓨鍗曚綅",
purQty: "閲囪喘閲�",
purUnit: "閲囪喘鍗曚綅",
+ unit: '鍗曚綅',
qty: "瀹屾垚鏁伴噺",
splrBatch: "渚涘簲鍟嗘壒娆�",
splrCode: "渚涘簲鍟嗙紪鐮�",
diff --git a/rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx b/rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx
index 1b9a2f1..95c39cc 100644
--- a/rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx
@@ -282,7 +282,7 @@
<Stack direction="row" spacing={2}>
<Button variant="contained" onClick={() => setCreateDialog(true)}>鏂板鐗╂枡</Button>
{/* {asnId !== '' && <ConfirmButton label={'鍒犻櫎'} variant="outlined" color="error" onConfirm={handleDelete} />} */}
- <ConfirmButton label={'鍒犻櫎'} variant="outlined" color="error" onConfirm={handleDeleteItem} />
+ <ConfirmButton label={'ra.action.delete'} variant="outlined" color="error" onConfirm={handleDeleteItem} />
</Stack>
</Box>
<Box sx={{ mt: 2 }}>
diff --git a/rsf-admin/src/page/orders/asnOrder/AsnWareModal.jsx b/rsf-admin/src/page/orders/asnOrder/AsnWareModal.jsx
index 8f3788b..770ef8b 100644
--- a/rsf-admin/src/page/orders/asnOrder/AsnWareModal.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/AsnWareModal.jsx
@@ -55,16 +55,18 @@
const hasarr = data.map(el => +el.matnrId)
const selectedData = selectedRows.filter(item => !hasarr.includes(item)).map(id => (tableData.find(row => row.id === id)));
const value = selectedData.map((el => {
+ console.log(el);
const dynamicFields = dyFields.reduce((acc, item) => {
acc[item.fields] = el['extendFields']?.[item.fields] || '';
return acc;
}, {});
return {
+ ...el,
matnrId: el.id,
maktx: el.name,
matnrCode: el.code,
- stockUnit: el.stockUnit || '',
- purUnit: el.purchaseUnit || '',
+ stockUnit: el.unit,
+ purUnit: el.unit,
...dynamicFields
}
}))
@@ -176,11 +178,9 @@
};
export default AsnWareModal;
-
const AsnWareModalTable = ({ tableData, setTableData, selectedRows, setSelectedRows, dyFields, setDyFields }) => {
const translate = useTranslate();
const notify = useNotify();
-
const [columns, setColumns] = useState([
// { field: 'id', headerName: 'ID', width: 100 },
{ field: 'name', headerName: translate('table.field.matnr.name'), width: 300 },
@@ -189,20 +189,16 @@
{ field: 'spec', headerName: translate('table.field.matnr.spec'), width: 100 },
{ field: 'model', headerName: translate('table.field.matnr.model'), width: 100 },
{ field: 'weight', headerName: translate('table.field.matnr.weight'), width: 100 },
-
{ field: 'describle', headerName: translate('table.field.matnr.describle'), width: 100 },
{ field: 'nromNum', headerName: translate('table.field.matnr.nromNum'), width: 100 },
{ field: 'unit', headerName: translate('table.field.matnr.unit'), width: 100 },
- { field: 'purchaseUnit', headerName: translate('table.field.matnr.purUnit'), width: 100 },
+ { field: 'purUnit', headerName: translate('table.field.matnr.purUnit'), width: 100 },
{ field: 'stockUnit', headerName: translate('table.field.matnr.stockUnit'), width: 100 },
{ field: 'stockLeval$', headerName: translate('table.field.matnr.stockLevel'), width: 100, sortable: false },
])
-
-
const handleSelectionChange = (ids) => {
setSelectedRows(ids)
-
};
useEffect(() => {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java
index 014c228..485bae5 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java
@@ -13,8 +13,6 @@
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
-import com.vincent.rsf.server.manager.controller.params.BatchUpdateParam;
-import com.vincent.rsf.server.manager.entity.AsnOrder;
import com.vincent.rsf.server.manager.entity.AsnOrderItem;
import com.vincent.rsf.server.manager.entity.Companys;
import com.vincent.rsf.server.manager.entity.excel.AsnOrderTemplate;
@@ -80,7 +78,7 @@
params.put("createBy", getLoginUserId());
params.put("updateBy", getLoginUserId());
- if (!asnOrderItemService.fieldsSave(params)) {
+ if (!asnOrderItemService.fieldsSave(params, getLoginUserId())) {
return R.error("Save Fail");
}
return R.ok("Save Success");
@@ -171,9 +169,9 @@
@PostMapping("/asnOrderItem/import")
@ApiOperation("ASN瀵煎叆鎺ュ彛")
@PreAuthorize("hasAuthority('manager:asnOrderItem:update')")
- public R importExcel(@RequestParam(value = "file") MultipartFile file, @RequestParam String asnId) throws Exception {
+ public R importExcel(@RequestParam(value = "file") MultipartFile file) throws Exception {
if (Objects.isNull(file)) {
- R.error("鏂囦欢涓嶈兘涓虹┖锛侊紒");
+ return R.error("鏂囦欢涓嶈兘涓虹┖锛侊紒");
}
HashMap<String, Object> hashMap = new HashMap<>();
return asnOrderItemService.excelImport(file, hashMap, getLoginUserId());
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderItemService.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderItemService.java
index 0f45ece..2978b52 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderItemService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/AsnOrderItemService.java
@@ -18,7 +18,7 @@
R excelImport(MultipartFile file, HashMap<String, Object> hashMap, Long loginUserId) throws Exception;
- boolean fieldsSave(Map<String, Object> params);
+ boolean fieldsSave(Map<String, Object> params, Long loginUserId);
R generateBarcode(List<Long> orders);
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java
index d8daa85..40753d9 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java
@@ -35,7 +35,6 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
-import javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;
@@ -94,7 +93,7 @@
for (String key : listMap.keySet()) {
AsnOrderTemplate template = listMap.get(key).stream().findFirst().get();
AsnOrder asnOrder = asnOrderMapper.getOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getCode, template.getCode()));
- if (Objects.isNull(asnOrder)) {
+ if (!Objects.isNull(asnOrder)) {
continue;
}
AsnOrder order = new AsnOrder();
@@ -153,6 +152,7 @@
/**
* @param
+ * @param loginUserId
* @return
* @author Ryan
* @description ASN鏄庣粏鍗曟嵁淇濆瓨锛屽強鎵╁睍瀛楁淇濆瓨
@@ -160,12 +160,12 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public boolean fieldsSave(Map<String, Object> params) {
+ public boolean fieldsSave(Map<String, Object> params, Long loginUserId) {
AsnOrderItem asnOrderItem = JSONObject.parseObject(JSONObject.toJSONString(params), AsnOrderItem.class);
+ asnOrderItem.setUpdateBy(loginUserId).setCreateBy(loginUserId);
if (StringUtils.isBlank(asnOrderItem.getTrackCode())) {
String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LABEL_CODE, asnOrderItem);
asnOrderItem.setTrackCode(ruleCode).setBarcode(ruleCode);
-
}
if (Objects.isNull(asnOrderItem.getAnfme()) || Double.compare(asnOrderItem.getAnfme(), 0.0) <= 0) {
throw new CoolException("璁″垝鏁颁笉鑳戒负绌猴紒锛�");
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
index 5f6f3c7..4b6c928 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
@@ -117,7 +117,7 @@
throw new CoolException("涓诲崟淇濆瓨澶辫触锛侊紒");
}
if (params.getItems().isEmpty()) {
- throw new CoolException("鏀惰揣閫氱煡鍗曟槑缁嗕笉鑳戒负瀵掗鑺傦紒锛�");
+ throw new CoolException("鏀惰揣閫氱煡鍗曟槑缁嗕笉鑳戒负绌猴紒锛�");
}
params.setOrders(orders);
@@ -171,7 +171,7 @@
item.put("poCode", orders.getPoCode());
item.put("createBy", loginUserId);
item.put("updateBy", loginUserId);
- if (!asnOrderItemService.fieldsSave(item)) {
+ if (!asnOrderItemService.fieldsSave(item, loginUserId)) {
throw new CoolException("鏄庣粏淇濆瓨澶辫触锛侊紒");
}
});
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
index 4b139ae..126219c 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
@@ -69,7 +69,7 @@
item.put("poCode", orders.getPoCode());
item.put("createBy", loginUserId);
item.put("updateBy", loginUserId);
- if (!asnOrderItemService.fieldsSave(item)) {
+ if (!asnOrderItemService.fieldsSave(item, loginUserId)) {
throw new CoolException("鏄庣粏淇濆瓨澶辫触锛侊紒");
}
});
--
Gitblit v1.9.1