From eba3ce4a22ea7bd74c6ad4a9114039c3ce43f476 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期三, 21 一月 2026 14:52:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz
---
rsf-admin/src/page/orders/config/orderItemColumns.jsx | 138 +++++++++++++++++++
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java | 65 +++-----
rsf-server/src/main/java/com/vincent/rsf/server/common/security/SecurityConfig.java | 4
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/InBoundController.java | 3
rsf-admin/src/i18n/zh.js | 6
rsf-admin/src/page/orders/outStockItem/OutStockItemList.jsx | 49 ------
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/AgvController.java | 6
rsf-admin/src/page/orders/asnOrderItem/AsnOrderItemList.jsx | 49 ------
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaCheckOrderController.java | 10 -
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/MobileController.java | 83 +++++------
10 files changed, 215 insertions(+), 198 deletions(-)
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 0256cf5..15cc0c9 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -720,7 +720,7 @@
orderCode: "鍗曞彿",
matnrId: "鐗╂枡鏍囪瘑",
platOrderCode: '瀹㈡埛鍗曞彿',
- platWorkCode: '宸ュ崟鍙�',
+ platWorkCode: '璁″垝璺熻釜鍙�',
projectCode: '椤圭洰鍙�',
maktx: "鐗╂枡鍚嶇О",
spec: "瑙勬牸",
@@ -778,7 +778,7 @@
model: "鍨嬪彿",
fieldsIndex: "瀛楁绱㈠紩",
platOrderCode: "瀹㈠崟鍙�",
- platWorkCode: "宸ュ崟鍙�",
+ platWorkCode: "璁″垝璺熻釜鍙�",
projectCode: "椤圭洰鍗曞彿",
},
@@ -815,7 +815,7 @@
platItemId: '琛屽彿',
matnrId: "鐗╂枡鏍囪瘑",
platOrderCode: '瀹㈡埛鍗曞彿',
- platWorkCode: '宸ュ崟鍙�',
+ platWorkCode: '璁″垝璺熻釜鍙�',
projectCode: '椤圭洰鍙�',
maktx: "鐗╂枡鍚嶇О",
spec: "瑙勬牸",
diff --git a/rsf-admin/src/page/orders/asnOrderItem/AsnOrderItemList.jsx b/rsf-admin/src/page/orders/asnOrderItem/AsnOrderItemList.jsx
index 33c9949..d8719bf 100644
--- a/rsf-admin/src/page/orders/asnOrderItem/AsnOrderItemList.jsx
+++ b/rsf-admin/src/page/orders/asnOrderItem/AsnOrderItemList.jsx
@@ -39,8 +39,8 @@
import { styled } from '@mui/material/styles';
import PageDrawer from "../../components/PageDrawer";
-import request from '@/utils/request';
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
+import { fetchInOrderItemColumns } from '../config/orderItemColumns';
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
'& .css-1vooibu-MuiSvgIcon-root': {
@@ -147,50 +147,11 @@
}, []);
const getDynamicFields = async () => {
- const { data: { code, data, msg }, } = await request.get("/fields/enable/list");
- if (code == 200) {
- const arr = [
- <NumberField source="id" />,
- <NumberField source="orderId" label="table.field.asnOrderItem.orderId" />,
- <TextField source="orderCode" label="table.field.asnOrderItem.orderCode" />,
- // <TextField source="poDetlId" label="table.field.asnOrderItem.poDetlId" />,
- // <TextField source="poDetlCode" label="table.field.asnOrderItem.poDetlCode" />,
- <TextField source="platItemId" label="table.field.asnOrderItem.platItemId" />,
- <TextField source="matnrId" label="table.field.asnOrderItem.matnrId" />,
- <TextField source="matnrCode" label="table.field.asnOrderItem.matnrCode" />,
- <TextField source="maktx" label="table.field.asnOrderItem.maktx" />,
- <TextField source="splrBatch" label="table.field.asnOrderItem.splrBatch" />,
- <TextField source="platOrderCode" label="table.field.asnOrderItem.platOrderCode" />,
- <TextField source="platWorkCode" label="table.field.asnOrderItem.platWorkCode" />,
- <TextField source="projectCode" label="table.field.asnOrderItem.projectCode" />,
- <TextField source="spec" label="table.field.asnOrderItem.spec" />,
- <TextField source="model" label="table.field.asnOrderItem.model" />,
- <NumberField source="anfme" label="table.field.asnOrderItem.anfme" />,
- <NumberField source="qty" label="table.field.asnOrderItem.qty" />,
- <TextField source="stockUnit" label="table.field.asnOrderItem.stockUnit" />,
- <NumberField source="purQty" label="table.field.asnOrderItem.purQty" />,
- <TextField source="purUnit" label="table.field.asnOrderItem.purUnit" />,
- <TextField source="splrCode" label="table.field.asnOrderItem.splrCode" />,
- <TextField source="splrName" label="table.field.asnOrderItem.splrName" />,
- <TextField source="isptResult$" label="table.field.asnOrderItem.isptResult" />,
- <TextField source="qrcode" label="table.field.asnOrderItem.qrcode" />,
- <TextField source="trackCode" label="table.field.asnOrderItem.barcode" />,
- <TextField source="packName" label="table.field.asnOrderItem.packName" />,
- ]
- const fields = data.map(el => <TextField key={el.fields} source={`extendFields.[${el.fields}]`} label={el.fieldsAlise} />)
- const lastArr = [
- <DateField source="updateTime" label="common.field.updateTime" showTime />,
- <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
- <TextField source="nickname" />
- </ReferenceField>,
- <ReferenceField source="createBy" label="common.field.createBy" reference="user" link={false} sortable={false}>
- <TextField source="nickname" />
- </ReferenceField>,
- <DateField source="createTime" label="common.field.createTime" showTime />,
- ]
- setColumns([...arr, ...fields, ...lastArr]);
+ const result = await fetchInOrderItemColumns();
+ if (result.success) {
+ setColumns(result.columns);
} else {
- notify(msg);
+ notify(result.msg);
}
}
diff --git a/rsf-admin/src/page/orders/config/orderItemColumns.jsx b/rsf-admin/src/page/orders/config/orderItemColumns.jsx
new file mode 100644
index 0000000..aa939e1
--- /dev/null
+++ b/rsf-admin/src/page/orders/config/orderItemColumns.jsx
@@ -0,0 +1,138 @@
+import React from "react";
+import {
+ TextField,
+ NumberField,
+ DateField,
+ ReferenceField,
+} from 'react-admin';
+import request from '@/utils/request';
+
+/**
+ * 鑾峰彇鍑哄簱璁㈠崟鏄庣粏鐨勫熀纭�鍒楅厤缃�
+ * @returns {Array} 鍩虹鍒楁暟缁�
+ */
+export const getOutOrderItemBaseColumns = () => [
+ <NumberField source="id" key="id" />, // id
+ <TextField source="orderCode" label="table.field.asnOrderItem.orderCode" key="orderCode" />, // 璁㈠崟鍙�
+ <TextField source="platWorkCode" label="table.field.asnOrderItem.platWorkCode" key="platWorkCode" />, //璁″垝璺熻釜鍙�
+ <TextField source="splrCode" label="table.field.asnOrderItem.splrCode" key="splrCode" />, //渚涘簲鍟嗙紪鐮�
+ <TextField source="splrName" label="table.field.asnOrderItem.splrName" key="splrName" />, //渚涘簲鍟嗗悕绉�
+ <TextField source="platItemId" label="table.field.asnOrderItem.platItemId" key="platItemId" />, //琛屽彿
+ <TextField source="matnrCode" label="table.field.asnOrderItem.matnrCode" key="matnrCode" />, //鐗╂枡缂栫爜
+ <TextField source="maktx" label="table.field.asnOrderItem.maktx" key="maktx" />, //鐗╂枡鍚嶇О
+ <TextField source="splrBatch" label="table.field.asnOrderItem.splrBatch" key="splrBatch" />, //鎵规
+ <TextField source="spec" label="table.field.asnOrderItem.spec" key="spec" />, //瑙勬牸
+ <NumberField source="anfme" label="table.field.asnOrderItem.anfme" key="anfme" />, //搴旀敹鏁伴噺
+ <NumberField source="qty" label="table.field.asnOrderItem.qty" key="qty" />, //瀹炴敹鏁伴噺
+ <TextField source="stockUnit" label="table.field.asnOrderItem.stockUnit" key="stockUnit" />, //鍗曚綅
+];
+
+/**
+ * 鑾峰彇鍏ュ簱璁㈠崟鏄庣粏鐨勫熀纭�鍒楅厤缃�
+ * @returns {Array} 鍩虹鍒楁暟缁�
+ */
+export const getInOrderItemBaseColumns = () => [
+ <NumberField source="id" key="id" />, // id
+ <TextField source="orderCode" label="table.field.asnOrderItem.orderCode" key="orderCode" />, // 璁㈠崟鍙�
+ <TextField source="platWorkCode" label="table.field.asnOrderItem.platWorkCode" key="platWorkCode" />, //璁″垝璺熻釜鍙�
+ <TextField source="splrCode" label="table.field.asnOrderItem.splrCode" key="splrCode" />, //渚涘簲鍟嗙紪鐮�
+ <TextField source="splrName" label="table.field.asnOrderItem.splrName" key="splrName" />, //渚涘簲鍟嗗悕绉�
+ <TextField source="platItemId" label="table.field.asnOrderItem.platItemId" key="platItemId" />, //琛屽彿
+ <TextField source="matnrCode" label="table.field.asnOrderItem.matnrCode" key="matnrCode" />, //鐗╂枡缂栫爜
+ <TextField source="maktx" label="table.field.asnOrderItem.maktx" key="maktx" />, //鐗╂枡鍚嶇О
+ <TextField source="splrBatch" label="table.field.asnOrderItem.splrBatch" key="splrBatch" />, //鎵规
+ <TextField source="spec" label="table.field.asnOrderItem.spec" key="spec" />, //瑙勬牸
+ <NumberField source="anfme" label="table.field.asnOrderItem.anfme" key="anfme" />, //搴旀敹鏁伴噺
+ <NumberField source="qty" label="table.field.asnOrderItem.qty" key="qty" />, //瀹炴敹鏁伴噺
+ <TextField source="stockUnit" label="table.field.asnOrderItem.stockUnit" key="stockUnit" />, //鍗曚綅
+];
+
+/**
+ * 鑾峰彇鍔ㄦ�佹墿灞曞瓧娈靛垪
+ * @param {Array} fieldsData - 鍔ㄦ�佸瓧娈垫暟鎹�
+ * @returns {Array} 鍔ㄦ�佸瓧娈靛垪鏁扮粍
+ */
+export const getExtendFieldColumns = (fieldsData) => {
+ return fieldsData.map(el => (
+ <TextField
+ key={el.fields}
+ source={`extendFields.[${el.fields}]`}
+ label={el.fieldsAlise}
+ />
+ ));
+};
+
+/**
+ * 鑾峰彇璁㈠崟鏄庣粏鐨勫熬閮ㄥ垪閰嶇疆锛堟椂闂村拰鎿嶄綔浜轰俊鎭級
+ * @returns {Array} 灏鹃儴鍒楁暟缁�
+ */
+export const getLastColumns = () => [
+ <DateField source="updateTime" label="common.field.updateTime" showTime key="updateTime" />,
+ <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false} key="updateBy">
+ <TextField source="nickname" />
+ </ReferenceField>,
+ <ReferenceField source="createBy" label="common.field.createBy" reference="user" link={false} sortable={false} key="createBy">
+ <TextField source="nickname" />
+ </ReferenceField>,
+ <DateField source="createTime" label="common.field.createTime" showTime key="createTime" />,
+];
+
+/**
+ * 缁勫悎鍏ュ簱璁㈠崟鏄庣粏鎵�鏈夊垪閰嶇疆
+ * @param {Array} extendFieldsData - 鍔ㄦ�佹墿灞曞瓧娈垫暟鎹�
+ * @returns {Array} 瀹屾暣鐨勫垪閰嶇疆鏁扮粍
+ */
+export const buildInOrderItemColumns = (extendFieldsData = []) => {
+ return [
+ ...getInOrderItemBaseColumns(),
+ ...getExtendFieldColumns(extendFieldsData),
+ ...getLastColumns()
+ ];
+};
+
+/**
+ * 缁勫悎鍑哄簱璁㈠崟鏄庣粏鎵�鏈夊垪閰嶇疆
+ * @param {Array} extendFieldsData - 鍔ㄦ�佹墿灞曞瓧娈垫暟鎹�
+ * @returns {Array} 瀹屾暣鐨勫垪閰嶇疆鏁扮粍
+ */
+export const buildOutOrderItemColumns = (extendFieldsData = []) => {
+ return [
+ ...getOutOrderItemBaseColumns(),
+ ...getExtendFieldColumns(extendFieldsData),
+ ...getLastColumns()
+ ];
+};
+
+/**
+ * 鑾峰彇鍔ㄦ�佸瓧娈靛苟鏋勫缓瀹屾暣鍒楅厤缃�
+ * @returns {Promise<{success: boolean, columns?: Array, msg?: string}>}
+ */
+export const fetchInOrderItemColumns = async () => {
+ try {
+ const { data: { code, data, msg } } = await request.get("/fields/enable/list");
+ if (code == 200) {
+ return { success: true, columns: buildInOrderItemColumns(data) };
+ } else {
+ return { success: false, msg };
+ }
+ } catch (error) {
+ return { success: false, msg: error.message };
+ }
+};
+
+/**
+ * 鑾峰彇鍔ㄦ�佸瓧娈靛苟鏋勫缓瀹屾暣鍒楅厤缃�
+ * @returns {Promise<{success: boolean, columns?: Array, msg?: string}>}
+ */
+export const fetchOutOrderItemColumns = async () => {
+ try {
+ const { data: { code, data, msg } } = await request.get("/fields/enable/list");
+ if (code == 200) {
+ return { success: true, columns: buildOutOrderItemColumns(data) };
+ } else {
+ return { success: false, msg };
+ }
+ } catch (error) {
+ return { success: false, msg: error.message };
+ }
+};
diff --git a/rsf-admin/src/page/orders/outStockItem/OutStockItemList.jsx b/rsf-admin/src/page/orders/outStockItem/OutStockItemList.jsx
index c2fced5..3fa70ae 100644
--- a/rsf-admin/src/page/orders/outStockItem/OutStockItemList.jsx
+++ b/rsf-admin/src/page/orders/outStockItem/OutStockItemList.jsx
@@ -39,8 +39,8 @@
import { styled } from '@mui/material/styles';
import PageDrawer from "../../components/PageDrawer";
-import request from '@/utils/request';
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
+import { fetchOutOrderItemColumns } from '../config/orderItemColumns';
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
'& .css-1vooibu-MuiSvgIcon-root': {
@@ -147,50 +147,11 @@
}, []);
const getDynamicFields = async () => {
- const { data: { code, data, msg }, } = await request.get("/fields/enable/list");
- if (code == 200) {
- const arr = [
- <NumberField source="id" />,
- <NumberField source="orderId" label="table.field.asnOrderItem.orderId" />,
- <TextField source="orderCode" label="table.field.asnOrderItem.orderCode" />,
- // <TextField source="poDetlId" label="table.field.asnOrderItem.poDetlId" />,
- // <TextField source="poDetlCode" label="table.field.asnOrderItem.poDetlCode" />,
- <TextField source="platItemId" label="table.field.asnOrderItem.platItemId" />,
- <TextField source="matnrId" label="table.field.asnOrderItem.matnrId" />,
- <TextField source="matnrCode" label="table.field.asnOrderItem.matnrCode" />,
- <TextField source="maktx" label="table.field.asnOrderItem.maktx" />,
- <TextField source="splrBatch" label="table.field.asnOrderItem.splrBatch" />,
- <TextField source="platOrderCode" label="table.field.asnOrderItem.platOrderCode" />,
- <TextField source="platWorkCode" label="table.field.asnOrderItem.platWorkCode" />,
- <TextField source="projectCode" label="table.field.asnOrderItem.projectCode" />,
- <TextField source="spec" label="table.field.asnOrderItem.spec" />,
- <TextField source="model" label="table.field.asnOrderItem.model" />,
- <NumberField source="anfme" label="table.field.asnOrderItem.anfme" />,
- <NumberField source="qty" label="table.field.asnOrderItem.qty" />,
- <TextField source="stockUnit" label="table.field.asnOrderItem.stockUnit" />,
- <NumberField source="purQty" label="table.field.asnOrderItem.purQty" />,
- <TextField source="purUnit" label="table.field.asnOrderItem.purUnit" />,
- <TextField source="splrCode" label="table.field.asnOrderItem.splrCode" />,
- <TextField source="splrName" label="table.field.asnOrderItem.splrName" />,
- <TextField source="isptResult$" label="table.field.asnOrderItem.isptResult" />,
- <TextField source="qrcode" label="table.field.asnOrderItem.qrcode" />,
- <TextField source="trackCode" label="table.field.asnOrderItem.barcode" />,
- <TextField source="packName" label="table.field.asnOrderItem.packName" />,
- ]
- const fields = data.map(el => <TextField key={el.fields} source={`extendFields.[${el.fields}]`} label={el.fieldsAlise} />)
- const lastArr = [
- <DateField source="updateTime" label="common.field.updateTime" showTime />,
- <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
- <TextField source="nickname" />
- </ReferenceField>,
- <ReferenceField source="createBy" label="common.field.createBy" reference="user" link={false} sortable={false}>
- <TextField source="nickname" />
- </ReferenceField>,
- <DateField source="createTime" label="common.field.createTime" showTime />,
- ]
- setColumns([...arr, ...fields, ...lastArr]);
+ const result = await fetchOutOrderItemColumns();
+ if (result.success) {
+ setColumns(result.columns);
} else {
- notify(msg);
+ notify(result.msg);
}
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/AgvController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/AgvController.java
index 843895c..74026e1 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/AgvController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/AgvController.java
@@ -25,7 +25,6 @@
private AgvService agvService;
@ApiOperation("绔欑偣缁戝畾鏌ヨ")
- @PreAuthorize("hasAuthority('manager:basStation:list')")
@PostMapping("/staBind/list")
public R getStaBindList(@RequestBody Map<String, Object> params) {
if (Objects.isNull(params)) {
@@ -35,7 +34,6 @@
}
@ApiOperation("绔欑偣鏌ヨ")
- @PreAuthorize("hasAuthority('manager:basStation:list')")
@PostMapping("/staMsg/select")
public R getStaMsgSelect(@RequestBody Map<String, Object> params) {
if (Objects.isNull(params)) {
@@ -44,7 +42,6 @@
return agvService.getStaMsgSelect(params);
}
- @PreAuthorize("hasAuthority('manager:basStation:list')")
@ApiOperation("绔欑偣缁戝畾")
@PostMapping("/AGV/staBind")
public R getAGVStaBind(@RequestBody WaitPakinParam waitPakinPda) {
@@ -54,7 +51,6 @@
return agvService.getAGVStaBind(waitPakinPda);
}
- @PreAuthorize("hasAuthority('manager:basStation:list')")
@ApiOperation("绔欑偣瑙ｇ粦")
@PostMapping("/AGV/staUnBind")
public R getAGVStaUnBind(@RequestBody Map<String, Object> params) {
@@ -64,7 +60,6 @@
return agvService.AGVStaUnBind(params);
}
- @PreAuthorize("hasAuthority('manager:basStation:list')")
@ApiOperation("AGV鍚姩鍏ュ簱")
@PostMapping("/AGV/task/start")
public R AGVInTaskStart(@RequestBody WaitPakinParam waitPakinPda) {
@@ -74,7 +69,6 @@
return agvService.AGVInTaskStart(waitPakinPda, getLoginUserId());
}
- @PreAuthorize("hasAuthority('manager:basStation:list')")
@ApiOperation("AGV缁戝畾&鍏ュ簱")
@PostMapping("/AGV/bindAndIn/start")
public R AGVBindAndInTaskStart(@RequestBody WaitPakinParam waitPakinPda) {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/InBoundController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/InBoundController.java
index cf84220..71eb84e 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/InBoundController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/InBoundController.java
@@ -23,11 +23,10 @@
@Autowired
private InBoundService inBoundService;
- @PreAuthorize("hasAuthority('manager:task:list')")
@PostMapping("/in/emptyContainer/warehousing")
@ApiOperation("绌哄鍣ㄥ叆搴�")
public R emptyContainerWarehousing(@RequestBody PdaGeneralParam param) {
- return inBoundService.generateTasks(param,getLoginUserId());
+ return inBoundService.generateTasks(param, getLoginUserId());
}
}
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 2670539..021ef4a 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
@@ -49,8 +49,10 @@
private WaitPakinService waitPakinService;
@Autowired
private AgvService agvService;
+
/**
* PDA鐢ㄦ埛鐧诲綍
+ *
* @param param
* @param request
* @return
@@ -71,16 +73,15 @@
return mobileService.login(param, request);
}
-
/**
* 鏍囧噯鎵爜鏀惰揣淇℃伅
+ *
* @param trackCode
* @return
*/
- @PreAuthorize("hasAuthority('manager:asnOrder:list')")
@GetMapping("/orders/{trackCode}")
@ApiOperation("鏍囧噯鎵爜鏀惰揣")
- public R getOrderBybarcode(@PathVariable String trackCode) {
+ public R getOrderBybarcode(@PathVariable String trackCode) {
if (StringUtils.isEmpty(trackCode)) {
throw new CoolException("鏉＄爜涓嶈兘涓虹┖锛侊紒");
}
@@ -89,20 +90,19 @@
/**
* 纭鏀惰揣淇℃伅
+ *
* @param params
* @return
*/
- @PreAuthorize("hasAuthority('manager:warehouseAreas:save')")
@PostMapping("/orders/confirm")
@ApiOperation("纭鏀惰揣")
public R confirmReceipt(@RequestBody Map<String, Object> params) {
- if (Objects.isNull(params)) {
- throw new CoolException("璇锋眰鍙傛暟涓嶈兘涓虹┖锛侊紒");
- }
+ if (Objects.isNull(params)) {
+ throw new CoolException("璇锋眰鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
return mobileService.receiptToWarehouse(params, getLoginUserId());
}
- @PreAuthorize("hasAuthority('manager:asnOrder:list')")
@PostMapping("/orders/other")
@ApiOperation("鍏跺畠鎵爜鏀惰揣")
public R getOtherReceipt(@RequestBody OtherReceiptParams params) {
@@ -112,38 +112,30 @@
return mobileService.otherReceipt(params);
}
- @PreAuthorize("hasAuthority('manager:warehouseAreas:list')")
@ApiOperation("鑾峰彇鏀惰揣鍖�")
@GetMapping("/areas/receipt")
public R getReceiptAreas() {
return mobileService.getReceiptAreas(getLoginUser());
}
- @PreAuthorize("hasAuthority('manager:warehouseAreas:list')")
@ApiOperation("鑾峰彇鍙敤搴撳尯")
@GetMapping("/areas/user/all")
public R getAreasUserAll() {
return mobileService.getAreasUserAll(getLoginUser());
}
-
- @PreAuthorize("hasAuthority('manager:asnOrder:list')")
@GetMapping("/orders/asn")
@ApiOperation("鑾峰彇閫氱煡鍗�")
public R getAllAsnOrders() {
return R.ok(mobileService.getAllAsnOrders());
}
-
- @PreAuthorize("hasAuthority('manager:asnOrder:list')")
@GetMapping("/dynamic/fields")
@ApiOperation("鑾峰彇鍔ㄦ�佸瓧娈�")
public R getDynamicFields() {
return R.ok(mobileService.getDynamicFields());
}
-
- @PreAuthorize("hasAuthority('manager:asnOrderItem:list')")
@ApiOperation("鑾峰彇璁㈠崟鐗╂枡鏄庣粏")
@PostMapping("/asnOrderItem/trackCode")
public R getItemByTrackCode(@RequestBody Map<String, Object> params) {
@@ -153,7 +145,6 @@
return mobileService.getDeltByCode(params);
}
- @PreAuthorize("hasAuthority('manager:asnOrderItem:list')")
@ApiOperation("鑾峰彇鎷栫洏鏄庣粏")
@PostMapping("/asnOrderItem/container")
public R getItemByContainer(@RequestBody Map<String, Object> params) {
@@ -163,17 +154,16 @@
if (!Objects.isNull(params.get("type")) && params.get("type").equals("unbind")) {
return mobileService.getUnItemByContainer(params);
} else {
- return mobileService.getItemByContainer(params,getLoginUser());
+ return mobileService.getItemByContainer(params, getLoginUser());
}
}
- @PreAuthorize("hasAuthority('manager:waitPakin:update')")
@ApiOperation("缁勬墭")
@PostMapping("/waitPakin/merge")
public R pikinOrder(@RequestBody WaitPakinParam waitPakin) {
Long userId = getLoginUserId();
if (Objects.isNull(waitPakin)) {
- return R.error( "鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
if (org.apache.commons.lang3.StringUtils.isBlank(waitPakin.getBarcode())) {
return R.error("鎵樼洏鐮佷笉鑳戒负绌猴紒锛�");
@@ -181,15 +171,14 @@
if (Objects.isNull(waitPakin.getItems()) || waitPakin.getItems().isEmpty()) {
return R.error("璺熻釜鐮佷笉鑳戒负绌猴紒锛�");
}
- try{
+ try {
mobileService.mergeItemsWcs(waitPakin, userId);
- } catch (Exception e){
+ } catch (Exception e) {
return R.error(e.getMessage());
}
return R.ok();
}
- @PreAuthorize("hasAuthority('manager:waitPakin:update')")
@ApiOperation("缁勬嫋瑙ｇ粦")
@PostMapping("/waitPakin/unbind")
public R pakinUnBind(@RequestBody WaitPakinParam param) {
@@ -207,7 +196,7 @@
@ApiOperation("鎶ユ")
@GetMapping("/asnOrder/inspect/{code}")
- @PreAuthorize("hasAuthority('manager:waitPakin:list')")
+
public R getAsnOdrers(@PathVariable String code) {
if (Objects.isNull(code)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
@@ -217,17 +206,17 @@
@ApiOperation("鎻愪氦鎶ユ")
@GetMapping("/inspect/confirm/{id}")
- @PreAuthorize("hasAuthority('manager:waitPakin:list')")
+
public R confirmInspect(@PathVariable String id) {
if (Objects.isNull(id)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛�");
}
- return mobileService.confirmIspt(id);
+ return mobileService.confirmIspt(id);
}
@ApiOperation("蹇�熻川妫�淇℃伅")
- @PreAuthorize("hasAuthority('manager:qlyInspect:list')")
-// @PostMapping("/inspect/query")
+
+ // @PostMapping("/inspect/query")
public R checkObjs(@RequestBody CheckObjParams params) {
if (Objects.isNull(params)) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
@@ -235,9 +224,8 @@
return mobileService.checkObjs(params);
}
-
@ApiOperation("蹇�熻川妫�")
- @PreAuthorize("hasAuthority('manager:qlyInspect:update')")
+
@PostMapping("/inspect/check/update")
public R checkUpdate(@RequestBody List<QlyIsptItem> params) {
if (Objects.isNull(params) || params.isEmpty()) {
@@ -247,7 +235,7 @@
}
@ApiOperation("鑾峰彇涓婃灦淇℃伅")
- @PreAuthorize("hasAuthority('manager:qlyInspect:list')")
+
@PostMapping("/stock/operate/list")
public R operateToStock(@RequestBody OpStockParams params) {
if (Objects.isNull(params)) {
@@ -257,21 +245,22 @@
}
@ApiOperation("浜哄伐涓婃灦")
- @PreAuthorize("hasAuthority('manager:qlyInspect:update')")
+
@PostMapping("/stock/operate")
public R publicToStock(@RequestBody ManualShelvingParams params) {
- if (Cools.isEmpty(params.getItemList()) || Cools.isEmpty(params.getLocCode()) || Cools.isEmpty(params.getBarcode())) {
+ if (Cools.isEmpty(params.getItemList()) || Cools.isEmpty(params.getLocCode())
+ || Cools.isEmpty(params.getBarcode())) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- WaitPakin waitPakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, params.getBarcode()));
-
+ WaitPakin waitPakin = waitPakinService
+ .getOne(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, params.getBarcode()));
return taskService.generateFlatWarehouseTasks(waitPakin, params.getLocCode(), getLoginUserId());
-// return mobileService.publicToStock(params, getLoginUserId());
+ // return mobileService.publicToStock(params, getLoginUserId());
}
@ApiOperation("鑾峰彇浠诲姟淇℃伅")
- @PreAuthorize("hasAuthority('manager:qlyInspect:list')")
+
@PostMapping("/task/stock/{code}")
public R taskToStock(@PathVariable String code) {
if (Objects.isNull(code)) {
@@ -281,7 +270,7 @@
}
@ApiOperation("浠诲姟涓婃灦")
- @PreAuthorize("hasAuthority('manager:qlyInspect:update')")
+
@PostMapping("/task/public/{code}")
public R taskToLocs(@PathVariable String code) throws Exception {
if (Objects.isNull(code)) {
@@ -292,7 +281,7 @@
@ApiOperation("涓�閿敹璐�")
@PostMapping("/complete/{id}")
- @PreAuthorize("hasAuthority('manager:asnOrder:update')")
+
public R completeOrder(@PathVariable Long id) {
if (Objects.isNull(id)) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
@@ -300,20 +289,19 @@
return mobileService.completeOrder(id, getLoginUserId());
}
-
@ApiOperation("鑾峰彇涓嶈壇鎵樼洏鐗╂枡")
@PostMapping("/defect/matnrs")
- @PreAuthorize("hasAuthority('manager:asnOrder:list')")
+
public R getAsnDefectItemByCode(@RequestBody Map<String, Object> map) {
if (Objects.isNull(map)) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- return mobileService.getItemByContainer(map,getLoginUser());
+ return mobileService.getItemByContainer(map, getLoginUser());
}
@ApiOperation("鑾峰彇璁㈠崟涓嶈壇鐗╂枡")
@PostMapping("/defect/{trackCode}")
- @PreAuthorize("hasAuthority('manager:asnOrder:list')")
+
public R defectProducts(@PathVariable String trackCode) {
if (Objects.isNull(trackCode)) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
@@ -323,7 +311,7 @@
@ApiOperation("鑾峰彇缁勬嫋鍏ュ簱淇℃伅")
@PostMapping("/pakin/info/{barcode}")
- @PreAuthorize("hasAuthority('manager:waitPakin:list')")
+
public R getPakinInStock(@PathVariable String barcode) {
if (Objects.isNull(barcode)) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
@@ -333,21 +321,21 @@
@ApiOperation("鑾峰彇涓婃灦绔欑偣淇℃伅")
@GetMapping("/inStock/sites")
- @PreAuthorize("hasAuthority('manager:deviceSite:list')")
+
public R getTarSite() {
return mobileService.getDeviceSites();
}
@ApiOperation("鑾峰彇鎺ㄨ崘搴撲綅鍒楄〃淇℃伅")
@GetMapping("/locs/list")
- @PreAuthorize("hasAuthority('manager:deviceSite:list')")
+
public R getLocs() {
return mobileService.getRecommondLocs();
}
@ApiOperation("鐢熸垚浠诲姟鍒楄〃")
@PostMapping("/pakin/task")
- @PreAuthorize("hasAuthority('manager:deviceSite:list')")
+
public R pakinToTask(@RequestBody Map<String, Object> map) {
if (Objects.isNull(map)) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
@@ -355,4 +343,3 @@
return mobileService.generateTask(map, getLoginUserId());
}
}
-
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaCheckOrderController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaCheckOrderController.java
index f4c04ff..54b9788 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaCheckOrderController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaCheckOrderController.java
@@ -20,7 +20,6 @@
@Autowired
private PdaCheckOrderService pdaCheckOrderService;
- @PreAuthorize("hasAuthority('manager:task:list')")
@PostMapping("/getCheckList")
@ApiOperation("鏌ヨ鐩樼偣宸紓鍗曞垪琛�")
public R getCheckList(@RequestBody Map<String, String> map) {
@@ -28,15 +27,13 @@
return pdaCheckOrderService.getCheckList(map.get("code"));
}
- @PreAuthorize("hasAuthority('manager:task:list')")
@PostMapping("/getCheckTaskItemList")
@ApiOperation("鏌ヨ鐩樼偣浠诲姟鍒楄〃")
public R getCheckTaskItemList(@RequestBody Map<String, String> map) {
- return pdaCheckOrderService.getCheckTaskItemList(map.get("barcode"),map.get("checkCode"));
+ return pdaCheckOrderService.getCheckTaskItemList(map.get("barcode"), map.get("checkCode"));
}
- @PreAuthorize("hasAuthority('manager:task:list')")
@PostMapping("/getCheckTaskItemList2")
@ApiOperation("鏌ヨ鐩樼偣浠诲姟鍒楄〃,鐩存帴鎵鍣ㄧ爜")
public R getCheckTaskItemList2(@RequestBody Map<String, String> map) {
@@ -44,7 +41,6 @@
return pdaCheckOrderService.getCheckTaskItemList2(map.get("barcode"));
}
- @PreAuthorize("hasAuthority('manager:task:list')")
@GetMapping("/getCheckDiffReasonList")
@ApiOperation("鏌ヨ鐩樼偣宸紓鍘熷洜")
public R getCheckDiffReasonList() {
@@ -52,14 +48,12 @@
return pdaCheckOrderService.getCheckDiffReasonList();
}
- @PreAuthorize("hasAuthority('manager:task:list')")
@PostMapping("/saveCheckDiff")
@ApiOperation("淇濆瓨鐩樼偣鏁版嵁")
public R saveCheckDiff(@RequestBody SaveCheckDiffParams saveCheckDiffParams) {
- return pdaCheckOrderService.saveCheckDiff(saveCheckDiffParams,getLoginUserId());
+ return pdaCheckOrderService.saveCheckDiff(saveCheckDiffParams, getLoginUserId());
}
- @PreAuthorize("hasAuthority('manager:task:list')")
@PostMapping("/selectAddMatnr")
@ApiOperation("鏌ヨ闇�瑕佹坊鍔犵殑鐗╂枡")
public R selectAddMatnr(@RequestBody Map<String, String> map) {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java
index fc5c671..4fcca4a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java
@@ -9,7 +9,6 @@
import com.vincent.rsf.server.api.entity.params.ContainerWaveParam;
import com.vincent.rsf.server.api.entity.params.OrderOutGeneralParam;
import com.vincent.rsf.server.api.service.PdaOutStockService;
-import com.vincent.rsf.server.manager.controller.params.OrderOutTaskParam;
import com.vincent.rsf.server.manager.entity.WkOrder;
import com.vincent.rsf.server.manager.entity.WkOrderItem;
import com.vincent.rsf.server.manager.enums.OrderType;
@@ -43,7 +42,6 @@
@Autowired
private DictDataService dictDataService;
- @PreAuthorize("hasAuthority('manager:task:list')")
@GetMapping("/outStockTaskItem/{barcode}")
@ApiOperation("蹇�熸嫞璐ф煡璇�")
public R getOutStockTaskItem(@PathVariable String barcode) {
@@ -51,7 +49,6 @@
return pdaOutStockService.getOutStockTaskItem(barcode);
}
- @PreAuthorize("hasAuthority('manager:task:list')")
@GetMapping("/saveOutTaskSts/{barcode}")
@ApiOperation("蹇�熸嫞璐�")
public R saveOutTaskSts(@PathVariable String barcode) {
@@ -59,7 +56,6 @@
return pdaOutStockService.saveOutTaskSts(barcode);
}
- @PreAuthorize("hasAuthority('manager:task:list')")
@PostMapping("/getWaveList")
@ApiOperation("鏌ヨ娉㈡鍒楄〃")
public R getWaveListItem(@RequestBody Map<String, String> map) {
@@ -67,7 +63,6 @@
return pdaOutStockService.getWaveListItem(map.get("barcode"));
}
- @PreAuthorize("hasAuthority('manager:task:list')")
@PostMapping("/getContainerWaveList")
@ApiOperation("鏍规嵁瀹瑰櫒鐮佹煡璇㈡尝娆″強鍑哄簱鍗�")
public R getContainerWaveList(@RequestBody Map<String, String> map) {
@@ -75,66 +70,64 @@
return pdaOutStockService.getContainerWaveList(map);
}
- @PreAuthorize("hasAuthority('manager:task:list')")
@PostMapping("/saveWavePick")
@ApiOperation("鏍规嵁瀹瑰櫒鐮佹煡璇㈡尝娆″強鍑哄簱鍗�")
public R saveWavePick(@RequestBody ContainerWaveParam containerWaveParam) {
- return pdaOutStockService.saveWavePick(containerWaveParam,getLoginUserId());
+ return pdaOutStockService.saveWavePick(containerWaveParam, getLoginUserId());
}
- @PreAuthorize("hasAuthority('manager:task:list')")
@PostMapping("/callForEmptyContainers")
@ApiOperation("鍛煎彨绌哄鍣�")
public R callForEmptyContainers(@RequestBody CallForEmptyContainersParam containerWaveParam) {
- return pdaOutStockService.callForEmptyContainers(containerWaveParam,getLoginUserId());
+ return pdaOutStockService.callForEmptyContainers(containerWaveParam, getLoginUserId());
}
-// @PreAuthorize("hasAuthority('manager:outStock:list')")
+ // @PreAuthorize("hasAuthority('manager:outStock:list')")
@PostMapping("/outStockItem/page")
public R page(@RequestBody JSONObject param) {
- return R.ok().add(outStockItemService.list(new LambdaQueryWrapper<>(WkOrderItem.class).eq(WkOrderItem::getDeleted, 0)
- .eq(WkOrderItem::getOrderCode, param.getString("orderId"))));
+ return R.ok()
+ .add(outStockItemService.list(new LambdaQueryWrapper<>(WkOrderItem.class).eq(WkOrderItem::getDeleted, 0)
+ .eq(WkOrderItem::getOrderCode, param.getString("orderId"))));
}
@PostMapping("/orderOut/getType")
public R orderOutGetType(@RequestBody OrderOutGeneralParam param) {
- if (Cools.isEmpty(param)){
+ if (Cools.isEmpty(param)) {
return R.ok();
}
List<DictData> dictData = dictDataService.list(new LambdaQueryWrapper<DictData>()
.eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_BUSINESS_TYPE)
- .in(DictData::getValue, param.getType())
- );
+ .in(DictData::getValue, param.getType()));
return R.ok(dictData);
}
@RequestMapping(value = "/orderOut/list")
- public R pdaPageList(@RequestParam(required = true)String orderNo,
- @RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "5")Integer limit){
+ public R pdaPageList(@RequestParam(required = true) String orderNo,
+ @RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "5") Integer limit) {
Page<WkOrder> page = new Page<>(curr, limit);
LambdaQueryWrapper<WkOrder> wkOrderLambdaQueryWrapper = new LambdaQueryWrapper<>();
wkOrderLambdaQueryWrapper.eq(WkOrder::getType, OrderType.ORDER_OUT.type);
- wkOrderLambdaQueryWrapper.eq(!Cools.isEmpty(orderNo),WkOrder::getCode, orderNo);
+ wkOrderLambdaQueryWrapper.eq(!Cools.isEmpty(orderNo), WkOrder::getCode, orderNo);
Page<WkOrder> wkOrderPage = outStockService.page(page, wkOrderLambdaQueryWrapper);
return R.ok(wkOrderPage);
}
@RequestMapping(value = "/orderOut/detlList")
- public R orderOutDetlList(@RequestParam(required = true)String orderNo){
+ public R orderOutDetlList(@RequestParam(required = true) String orderNo) {
- if (Cools.isEmpty(orderNo)){
+ if (Cools.isEmpty(orderNo)) {
return R.error("璁㈠崟鍙蜂负绌�");
}
LambdaQueryWrapper<WkOrderItem> wkOrderLambdaQueryWrapper = new LambdaQueryWrapper<>();
-// wkOrderLambdaQueryWrapper.eq(WkOrderItem::getType, OrderType.ORDER_OUT.type);
- wkOrderLambdaQueryWrapper.eq(!Cools.isEmpty(orderNo),WkOrderItem::getOrderCode, orderNo);
+ // wkOrderLambdaQueryWrapper.eq(WkOrderItem::getType, OrderType.ORDER_OUT.type);
+ wkOrderLambdaQueryWrapper.eq(!Cools.isEmpty(orderNo), WkOrderItem::getOrderCode, orderNo);
List<WkOrderItem> list = outStockItemService.list(wkOrderLambdaQueryWrapper);
return R.ok(list);
@@ -142,26 +135,16 @@
@PostMapping("/orderOut/getOutLocView")
public R orderOutGetOutLocView(@RequestBody OrderOutGeneralParam param) {
- //鍙傛暟 param.getOrderItemId()//鍑哄簱棰勮
- if (Cools.isEmpty(param)) {
- return R.error("鍙傛暟涓嶈兘涓虹┖");
- }
- OrderOutTaskParam orderOutTaskParam = new OrderOutTaskParam();
- orderOutTaskParam.setOrderId(param.getOrderItemId());
- orderOutTaskParam.setWaveId(param.getWaveId());
-
- return outStockService.getOrderOutTaskItem(orderOutTaskParam);
-
-// return R.ok();
- }
-//
- @PostMapping("/orderOut/getOutLocRun")
- public R orderOutGetOutLocRun(@RequestBody OrderOutGeneralParam param) {
- //鍙傛暟 param.getOrderItemId()//鍑哄簱鎵ц
+ // 鍙傛暟 param.getOrderItemId()//鍑哄簱棰勮
return R.ok();
}
-
-
+ //
+ // @PostMapping("/orderOut/getOutLocRun")
+ // public R orderOutGetOutLocView(@RequestBody OrderOutGeneralParam param) {
+ // //鍙傛暟 param.getOrderItemId()//鍑哄簱鎵ц
+ //
+ // return R.ok();
+ // }
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/security/SecurityConfig.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/security/SecurityConfig.java
index 58e365e..358e4b4 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/common/security/SecurityConfig.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/security/SecurityConfig.java
@@ -33,13 +33,13 @@
@EnableGlobalMethodSecurity(prePostEnabled = true)
public class SecurityConfig extends WebSecurityConfigurerAdapter {
- public static final String[] FILTER_PATH = new String[]{
+ public static final String[] FILTER_PATH = new String[] {
"/demo/**",
"/test/**",
"/system/info",
"/tenant/list",
"/email/code",
- "/pda/login",
+ "/pda/**",
"/erp/**",
"/base/**",
"/order/**",
--
Gitblit v1.9.1