From c414ff69c66e9b82871f6fbd9bbc7bf49431731f Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 19 五月 2025 20:16:46 +0800
Subject: [PATCH] 新增客户单号， 工单号，项目号 工作档新增仓库类型，添加仓库类型搜索
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyInspectServiceImpl.java | 6 +
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java | 4 +
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java | 3
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 3
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreasItem.java | 9 ++
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java | 10 ++
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyIsptItem.java | 9 ++
rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx | 18 +++-
rsf-admin/src/page/orders/qlyInspect/QlyIsptItemList.jsx | 8 +
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java | 12 +++
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItemLog.java | 13 +++
rsf-admin/src/page/task/TaskItemList.jsx | 8 +
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 4 +
rsf-admin/src/page/waitPakin/WaitPakinItemList.jsx | 8 +
rsf-admin/src/page/task/TaskList.jsx | 68 +++++++++-------
rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx | 10 ++
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java | 3
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinItem.java | 12 +++
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/AsnOrderTemplate.java | 14 +++
rsf-admin/src/i18n/zh.js | 6 +
rsf-admin/src/i18n/en.js | 4 +
21 files changed, 188 insertions(+), 44 deletions(-)
diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index 5c0819b..a286aa8 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -603,6 +603,9 @@
poDetlCode: "poDetlCode",
matnrId: "matnrId",
maktx: "maktx",
+ platOrderCode: 'Customer Order Code',
+ platWorkCode: 'Work Code',
+ projectCode: 'Project Code',
spec: "Spec",
model: "Model",
anfme: "anfme",
@@ -826,6 +829,7 @@
taskCode: "TaskCode",
taskStatus: "Status",
taskType: "Type",
+ warehType: "Warehouse Type",
orgLoc: "orgLoc",
orgSite: "orgSite",
targLoc: "targLoc",
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 167a92a..a4e2cf6 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -607,6 +607,9 @@
poDetlCode: "PO鍗�",
platItemId: '琛屽彿',
matnrId: "鐗╂枡鏍囪瘑",
+ platOrderCode: '瀹㈡埛鍗曞彿',
+ platWorkCode: '宸ュ崟鍙�',
+ projectCode: '椤圭洰鍙�',
maktx: "鐗╂枡鍚嶇О",
spec: "瑙勬牸",
model: "鍨嬪彿",
@@ -854,7 +857,8 @@
task: {
taskCode: "浠诲姟鍙�",
taskStatus: "鐘舵��",
- taskType: "绫诲瀷",
+ taskType: "浣滀笟绫诲瀷",
+ warehType: "浠撳簱绫诲瀷",
orgLoc: "婧愬簱浣�",
orgSite: "婧愮珯鐐�",
targLoc: "鐩爣搴撲綅",
diff --git a/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx b/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
index 71ff6c4..8b35a24 100644
--- a/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
@@ -71,6 +71,9 @@
<TextInput source="poDetlCode" label="table.field.asnOrderItem.poDetlCode" />,
<TextInput source="matnrId" label="table.field.asnOrderItem.matnrId" />,
<TextInput source="maktx" label="table.field.asnOrderItem.maktx" />,
+ <TextInput source="platOrderCode" label="table.field.asnOrderItem.platOrderCode" />,
+ <TextInput source="platWorkCode" label="table.field.asnOrderItem.platWorkCode" />,
+ <TextInput source="projectCode" label="table.field.asnOrderItem.projectCode" />,
<NumberInput source="anfme" label="table.field.asnOrderItem.anfme" />,
<TextInput source="stockUnit" label="table.field.asnOrderItem.stockUnit" />,
<NumberInput source="purQty" label="table.field.asnOrderItem.purQty" />,
@@ -118,7 +121,7 @@
}}
title={"menu.asnOrderItem"}
empty={false}
- filter={{ asnId: asnId}}
+ filter={{ asnId: asnId }}
filters={filters}
sort={{ field: "create_time", order: "desc" }}
actions={(
@@ -182,6 +185,9 @@
<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" />,
@@ -232,7 +238,7 @@
preferenceKey='asnOrderItem'
bulkActionButtons={false}
rowClick={(id, resource, record) => false}
- omit={['id', 'asnId', 'poDetlId', 'poDetlCode', 'matnrId', 'purQty', 'purUnit', 'qrcode', 'trackCode']}
+ omit={['id', 'asnId', 'poDetlId', 'poDetlCode', 'matnrId', 'purQty', 'purUnit', 'qrcode', 'trackCode', 'splrCode', 'platWorkCode', 'projectCode']}
>
{columns.map((column) => column)}
</StyledDatagrid>}
diff --git a/rsf-admin/src/page/orders/qlyInspect/QlyIsptItemList.jsx b/rsf-admin/src/page/orders/qlyInspect/QlyIsptItemList.jsx
index ffaa64c..49e1601 100644
--- a/rsf-admin/src/page/orders/qlyInspect/QlyIsptItemList.jsx
+++ b/rsf-admin/src/page/orders/qlyInspect/QlyIsptItemList.jsx
@@ -70,6 +70,9 @@
<TextInput source="splrName" label="table.field.qlyIsptItem.splrName" />,
<TextInput source="splrBatch" label="table.field.qlyIsptItem.splrBatch" />,
<TextInput source="stockBatch" label="table.field.qlyIsptItem.stockBatch" />,
+ <TextInput source="platOrderCode" label="table.field.asnOrderItem.platOrderCode" />,
+ <TextInput source="platWorkCode" label="table.field.asnOrderItem.platWorkCode" />,
+ <TextInput source="projectCode" label="table.field.asnOrderItem.projectCode" />,
<NumberInput source="rcptQty" label="table.field.qlyIsptItem.rcptQty" />,
<NumberInput source="dlyQty" label="table.field.qlyIsptItem.dlyQty" />,
<NumberInput source="disQty" label="table.field.qlyIsptItem.disQty" />,
@@ -163,6 +166,9 @@
<TextField source="label" label="table.field.qlyIsptItem.label" />,
<TextField source="splrBatch" label="table.field.qlyIsptItem.splrBatch" />,
<TextField source="stockBatch" label="table.field.qlyIsptItem.stockBatch" />,
+ <TextField source="platOrderCode" label="table.field.asnOrderItem.platOrderCode" />,
+ <TextField source="platWorkCode" label="table.field.asnOrderItem.platWorkCode" />,
+ <TextField source="projectCode" label="table.field.asnOrderItem.projectCode" />,
<NumberField source="rcptQty" label="table.field.qlyIsptItem.rcptQty" />,
<NumberField source="dlyQty" label="table.field.qlyIsptItem.dlyQty" />,
<MyField source="anfme" label="table.field.qlyIsptItem.anfme"
@@ -211,7 +217,7 @@
preferenceKey='qlyIsptItem'
bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
rowClick={false}
- omit={['id', 'createTime', 'createBy', 'memo', 'dlyQty', 'label', 'stockBatch', 'picPath', 'ispectId', 'statusBool']}
+ omit={['id', 'createTime', 'createBy', 'memo', 'dlyQty', 'label', 'stockBatch', 'picPath', 'ispectId', 'statusBool', 'platWorkCode', 'projectCode']}
>
{columns.map((column) => column)}
diff --git a/rsf-admin/src/page/task/TaskItemList.jsx b/rsf-admin/src/page/task/TaskItemList.jsx
index 9fd01f6..295fb18 100644
--- a/rsf-admin/src/page/task/TaskItemList.jsx
+++ b/rsf-admin/src/page/task/TaskItemList.jsx
@@ -58,6 +58,9 @@
<TextInput source="matnrCode" label="table.field.taskItem.matnrCode" />,
<TextInput source="unit" label="table.field.taskItem.unit" />,
<NumberInput source="anfme" label="table.field.taskItem.anfme" />,
+ <TextInput source="platOrderCode" label="table.field.asnOrderItem.platOrderCode" />,
+ <TextInput source="platWorkCode" label="table.field.asnOrderItem.platWorkCode" />,
+ <TextInput source="projectCode" label="table.field.asnOrderItem.projectCode" />,
<TextInput source="batch" label="table.field.taskItem.batch" />,
<TextInput source="spec" label="table.field.taskItem.spec" />,
<TextInput source="model" label="table.field.taskItem.model" />,
@@ -149,6 +152,9 @@
<TextField source="matnrCode" label="table.field.taskItem.matnrCode" />,
<TextField source="unit" label="table.field.taskItem.unit" />,
<NumberField source="anfme" label="table.field.taskItem.anfme" />,
+ <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="batch" label="table.field.taskItem.batch" />,
<TextField source="isptResult$" label="table.field.taskItem.isptResult" />,
<TextField source="spec" label="table.field.taskItem.spec" />,
@@ -193,7 +199,7 @@
rowClick={false}
// expand={() => <TaskItemPanel />}
expandSingle={true}
- omit={['id', 'createTime', 'createBy', 'memo', 'taskId', 'orderId', 'orderItemId', 'matnrId']}
+ omit={['id', 'createTime', 'createBy', 'memo', 'taskId', 'orderId', 'orderItemId', 'matnrId', 'platWorkCode', 'projectCode']}
>
{columns.map((column) => column)}
</StyledDatagrid>}
diff --git a/rsf-admin/src/page/task/TaskList.jsx b/rsf-admin/src/page/task/TaskList.jsx
index 1b85223..e482fe3 100644
--- a/rsf-admin/src/page/task/TaskList.jsx
+++ b/rsf-admin/src/page/task/TaskList.jsx
@@ -18,6 +18,7 @@
TextField,
NumberField,
DateField,
+ AutocompleteInput,
BooleanField,
TextInput,
DateInput,
@@ -55,40 +56,46 @@
},
}));
-const filters = [
- <SearchInput source="condition" alwaysOn />,
- <DateInput label='common.time.after' source="timeStart" />,
- <DateInput label='common.time.before' source="timeEnd" />,
- <TextInput source="taskCode" label="table.field.task.taskCode" />,
- <NumberInput source="taskStatus" label="table.field.task.taskStatus" />,
- <NumberInput source="taskType" label="table.field.task.taskType" />,
- <TextInput source="orgLoc" label="table.field.task.orgLoc" />,
- <TextInput source="orgSite" label="table.field.task.orgSite" />,
- <TextInput source="targLoc" label="table.field.task.targLoc" />,
- <TextInput source="targSite" label="table.field.task.targSite" />,
- <TextInput source="barcode" label="table.field.task.barcode" />,
- <TextInput source="robotCode" label="table.field.task.robotCode" />,
- <NumberInput source="exceStatus" label="table.field.task.exceStatus" />,
- <TextInput source="expDesc" label="table.field.task.expDesc" />,
- <NumberInput source="sort" label="table.field.task.sort" />,
- <TextInput source="expCode" label="table.field.task.expCode" />,
- <DateInput source="startTime" label="table.field.task.startTime" />,
- <DateInput source="endTime" label="table.field.task.endTime" />,
- <TextInput label="common.field.memo" source="memo" />,
- <SelectInput
- label="common.field.status"
- source="status"
- choices={[
- { id: '1', name: 'common.enums.statusTrue' },
- { id: '0', name: 'common.enums.statusFalse' },
- ]}
- resettable
- />,
-]
const TaskList = (props) => {
const translate = useTranslate();
const [drawerVal, setDrawerVal] = useState(false);
+ const dict = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_warehouse_type')) || [];
+
+ const filters = [
+ <SearchInput source="condition" alwaysOn />,
+ <DateInput label='common.time.after' source="timeStart" />,
+ <DateInput label='common.time.before' source="timeEnd" />,
+ <TextInput source="taskCode" label="table.field.task.taskCode" />,
+ <NumberInput source="taskStatus" label="table.field.task.taskStatus" />,
+ <NumberInput source="taskType" label="table.field.task.taskType" />,
+ <AutocompleteInput choices={dict} optionText='label' optionValue="value" source="warehType" label="table.field.task.warehType" />,
+ <TextInput source="orgLoc" label="table.field.task.orgLoc" />,
+ <TextInput source="orgSite" label="table.field.task.orgSite" />,
+ <TextInput source="targLoc" label="table.field.task.targLoc" />,
+ <TextInput source="targSite" label="table.field.task.targSite" />,
+ <TextInput source="barcode" label="table.field.task.barcode" />,
+ <TextInput source="robotCode" label="table.field.task.robotCode" />,
+ <NumberInput source="exceStatus" label="table.field.task.exceStatus" />,
+ <TextInput source="expDesc" label="table.field.task.expDesc" />,
+ <NumberInput source="sort" label="table.field.task.sort" />,
+ <TextInput source="expCode" label="table.field.task.expCode" />,
+ <DateInput source="startTime" label="table.field.task.startTime" />,
+ <DateInput source="endTime" label="table.field.task.endTime" />,
+ <TextInput label="common.field.memo" source="memo" />,
+ <SelectInput
+ label="common.field.status"
+ source="status"
+ choices={[
+ { id: '1', name: 'common.enums.statusTrue' },
+ { id: '0', name: 'common.enums.statusFalse' },
+ ]}
+ resettable
+ />,
+ ]
+
+
+
return (
<Box display="flex">
<List
@@ -130,6 +137,7 @@
<TextField source="taskCode" label="table.field.task.taskCode" />
<NumberField source="taskStatus$" label="table.field.task.taskStatus" />
<NumberField source="taskType$" label="table.field.task.taskType" />
+ <NumberField source="warehType$" label="table.field.task.taskType" />
<TextField source="orgLoc" label="table.field.task.orgLoc" />
<TextField source="orgSite" label="table.field.task.orgSite" />
<TextField source="targLoc" label="table.field.task.targLoc" />
diff --git a/rsf-admin/src/page/waitPakin/WaitPakinItemList.jsx b/rsf-admin/src/page/waitPakin/WaitPakinItemList.jsx
index fa3d78e..6e99dac 100644
--- a/rsf-admin/src/page/waitPakin/WaitPakinItemList.jsx
+++ b/rsf-admin/src/page/waitPakin/WaitPakinItemList.jsx
@@ -67,6 +67,9 @@
<TextInput source="maktx" label="table.field.waitPakinItem.maktx" />,
<NumberInput source="matnrId" label="table.field.waitPakinItem.matnrId" />,
<TextInput source="matnrCode" label="table.field.waitPakinItem.matnrCode" />,
+ <TextInput source="platOrderCode" label="table.field.asnOrderItem.platOrderCode" />,
+ <TextInput source="platWorkCode" label="table.field.asnOrderItem.platWorkCode" />,
+ <TextInput source="projectCode" label="table.field.asnOrderItem.projectCode" />,
<NumberInput source="anfme" label="table.field.waitPakinItem.anfme" />,
<NumberInput source="workQty" label="table.field.waitPakinItem.workQty" />,
<TextInput source="unit" label="table.field.waitPakinItem.unit" />,
@@ -160,6 +163,9 @@
<NumberField source="matnrId" label="table.field.waitPakinItem.matnrId" />,
<NumberField source="anfme" label="table.field.waitPakinItem.anfme" />,
<TextField source="unit" label="table.field.waitPakinItem.unit" />,
+ <TextField source="platOrderCode" label="table.field.asnOrderItem.platOrderCode" />,
+ <TextField source="platWorkCode" label="table.field.asnOrderItem.platWorkCode" />,
+ <TextField source="projectCode" label="table.field.asnOrderItem.projectCode" />,
<NumberField source="workQty" label="table.field.waitPakinItem.workQty" />,
<NumberField source="qty" label="table.field.waitPakinItem.qty" />,
<TextField source="fieldsIndex" label="table.field.waitPakinItem.fieldsIndex" />,
@@ -197,7 +203,7 @@
preferenceKey='waitPakinItem'
bulkActionButtons={false}
rowClick={(id, resource, record) => false}
- omit={['id', 'pakinId', 'createTime', 'matnrId', 'createBy', 'memo', 'fieldsIndex']}
+ omit={['id', 'pakinId', 'createTime', 'matnrId', 'createBy', 'memo', 'fieldsIndex', 'platWorkCode', 'projectCode']}
>
{columns.map((column) => column)}
</StyledDatagrid>}
diff --git a/rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx b/rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx
index a435d24..eab6bc6 100644
--- a/rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx
+++ b/rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx
@@ -73,6 +73,9 @@
<TextInput source="barcode" label="table.field.warehouseAreasItem.barcode" />,
<NumberInput source="anfme" label="table.field.warehouseAreasItem.anfme" />,
<TextInput source="batch" label="table.field.warehouseAreasItem.batch" />,
+ <TextInput source="platOrderCode" label="table.field.asnOrderItem.platOrderCode" />,
+ <TextInput source="platWorkCode" label="table.field.asnOrderItem.platWorkCode" />,
+ <TextInput source="projectCode" label="table.field.asnOrderItem.projectCode" />,
<TextInput source="unit" label="table.field.warehouseAreasItem.unit" />,
<TextInput source="stockUnit" label="table.field.warehouseAreasItem.stockUnit" />,
<TextInput source="brand" label="table.field.warehouseAreasItem.brand" />,
@@ -181,6 +184,9 @@
<NumberField key="anfme" source="anfme" label="table.field.warehouseAreasItem.anfme" />,
<NumberField key="workQty" source="workQty" label="table.field.warehouseAreasItem.workQty" />,
<NumberField key="qty" source="qty" label="table.field.warehouseAreasItem.qty" />,
+ <TextField source="platOrderCode" label="table.field.asnOrderItem.platOrderCode" />,
+ <TextField source="platWorkCode" label="table.field.asnOrderItem.platWorkCode" />,
+ <TextField source="projectCode" label="table.field.asnOrderItem.projectCode" />,
// <MyField source="isptQty" label="table.field.qlyIsptItem.anfme"
// onClick={(event, record, val) => {
// event.stopPropagation();
@@ -211,13 +217,13 @@
setColumns([...arr, ...fields, ...lastArr]);
//filters娣诲姞杩囨护瀛楁
data.map(el => {
- var i =0;
- filters.map((item) =>{
- if(item.key === el.fields){
- i = 1;
+ var i = 0;
+ filters.map((item) => {
+ if (item.key === el.fields) {
+ i = 1;
}
})
- i===0 && filters.push(<TextInput key={el.fields} source={el.fields} label={el.fieldsAlise} />)
+ i === 0 && filters.push(<TextInput key={el.fields} source={el.fields} label={el.fieldsAlise} />)
})
} else {
notify(msg);
@@ -242,7 +248,7 @@
preferenceKey='warehouseAreasItem'
bulkActionButtons={false}
rowClick={(id, resource, record) => false}
- omit={['id', 'createTime', 'memo', 'areaId', 'brand', 'createBy$', 'weight', 'matnrId', 'batch', 'shipperId', 'splrId']}
+ omit={['id', 'createTime', 'memo', 'areaId', 'brand', 'createBy$', 'weight', 'matnrId', 'batch', 'shipperId', 'splrId', 'platWorkCode', 'projectCode']}
>
{columns.map((column) => column)}
</StyledDatagrid>}
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 bfe75b6..04da855 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
@@ -365,6 +365,9 @@
.setProdTime(dto.getProdTime())
.setSplrId(companys.getId())
.setWeight(dto.getWeigth())
+ .setPlatOrderCode(orderItem.getPlatOrderCode())
+ .setPlatWorkCode(orderItem.getPlatWorkCode())
+ .setProjectCode(orderItem.getProjectCode())
//搴撳瓨鍗曚綅涓烘渶灏忓崟浣�
.setUnit(orderItem.getStockUnit())
.setStockUnit(orderItem.getStockUnit())
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java
index bf0bdee..8b5b490 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java
@@ -43,13 +43,21 @@
private Long asnId;
-
/**
* 骞冲彴鏍囪瘑锛堣鍙凤級
*/
@ApiModelProperty(value = "骞冲彴鏍囪瘑锛堣鍙凤級")
private String platItemId;
+ @ApiModelProperty("瀹㈡埛璁㈠崟鍙�")
+ private String platOrderCode;
+
+ @ApiModelProperty("宸ュ崟鍙�")
+ private String platWorkCode;
+
+ @ApiModelProperty("椤圭洰鍙�")
+ private String projectCode;
+
/**
* 鎵╁睍瀛楁
*/
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyIsptItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyIsptItem.java
index ff43690..fd2f557 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyIsptItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyIsptItem.java
@@ -90,6 +90,15 @@
@ApiModelProperty("璐ㄦ鏁伴噺")
private Double anfme;
+ @ApiModelProperty("瀹㈡埛璁㈠崟鍙�")
+ private String platOrderCode;
+
+ @ApiModelProperty("宸ュ崟鍙�")
+ private String platWorkCode;
+
+ @ApiModelProperty("椤圭洰鍙�")
+ private String projectCode;
+
/**
* 閫佽揣鏁伴噺
*/
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java
index 34fb5c3..ea87c01 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java
@@ -68,6 +68,18 @@
@ApiModelProperty("鍗曟嵁ID")
private Long orderId;
+ @ApiModelProperty("琛屽彿")
+ private String platItemId;
+
+ @ApiModelProperty("瀹㈡埛璁㈠崟鍙�")
+ private String platOrderCode;
+
+ @ApiModelProperty("宸ュ崟鍙�")
+ private String platWorkCode;
+
+ @ApiModelProperty("椤圭洰鍙�")
+ private String projectCode;
+
@ApiModelProperty("鍗曟嵁绫诲瀷")
private String orderType;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItemLog.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItemLog.java
index 73a2102..0bf8ed2 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItemLog.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItemLog.java
@@ -65,6 +65,19 @@
@ApiModelProperty(value= "鐗╂枡鍚嶇О")
private String maktx;
+
+ @ApiModelProperty("琛屽彿")
+ private String platItemId;
+
+ @ApiModelProperty("瀹㈡埛璁㈠崟鍙�")
+ private String platOrderCode;
+
+ @ApiModelProperty("宸ュ崟鍙�")
+ private String platWorkCode;
+
+ @ApiModelProperty("椤圭洰鍙�")
+ private String projectCode;
+
/**
* 鐗╂枡缂栫爜
*/
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinItem.java
index 541e98c..52630a8 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinItem.java
@@ -82,6 +82,18 @@
@ApiModelProperty("鐗╂枡璺熻釜鐮�")
private String trackCode;
+ @ApiModelProperty("琛屽彿")
+ private String platItemId;
+
+ @ApiModelProperty("瀹㈡埛璁㈠崟鍙�")
+ private String platOrderCode;
+
+ @ApiModelProperty("宸ュ崟鍙�")
+ private String platWorkCode;
+
+ @ApiModelProperty("椤圭洰鍙�")
+ private String projectCode;
+
/**
* 鐗╂枡鍚嶇О
*/
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreasItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreasItem.java
index 78f2cad..10f1fc3 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreasItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreasItem.java
@@ -85,6 +85,15 @@
@ApiModelProperty(value = "鎵╁睍瀛楁鍞竴鏍囪瘑")
private String fieldsIndex;
+ @ApiModelProperty("瀹㈡埛璁㈠崟鍙�")
+ private String platOrderCode;
+
+ @ApiModelProperty("宸ュ崟鍙�")
+ private String platWorkCode;
+
+ @ApiModelProperty("椤圭洰鍙�")
+ private String projectCode;
+
/**
* 鐗╂枡鍚嶇О
*/
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/AsnOrderTemplate.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/AsnOrderTemplate.java
index c69c49e..dbcc443 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/AsnOrderTemplate.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/AsnOrderTemplate.java
@@ -54,6 +54,20 @@
@ExcelComment(value = "platItemId", example = "1357564255478")
private String platItemId;
+ @Excel(name = "瀹㈡埛璁㈠崟鍙�")
+ @ApiModelProperty("瀹㈡埛璁㈠崟鍙�")
+ @ExcelComment(value = "platOrderCode", example = "PT202564713301")
+ private String platOrderCode;
+
+ @Excel(name = "宸ュ崟鍙�")
+ @ApiModelProperty("宸ュ崟鍙�")
+ @ExcelComment(value = "platWorkCode", example = "PWC2354894211")
+ private String platWorkCode;
+
+ @Excel(name = "椤圭洰鍙�")
+ @ApiModelProperty("椤圭洰鍙�")
+ @ExcelComment(value = "projectCode", example = "PC2365845636001")
+ private String projectCode;
/**
* 鍗曟嵁绫诲瀷
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java
index a68a986..b2bc885 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java
@@ -159,6 +159,9 @@
.setAsnCode(asnOrder.getCode())
.setAsnId(asnOrder.getId())
.setProdTime(orderItem.getProdTime())
+ .setPlatOrderCode(orderItem.getPlatOrderCode())
+ .setPlatWorkCode(orderItem.getPlatWorkCode())
+ .setProjectCode(orderItem.getProjectCode())
.setSplrId(companys.getId())
//搴撳瓨鍗曚綅涓烘渶灏忓崟浣�
.setUnit(orderItem.getStockUnit())
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 2775016..22ee73d 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
@@ -172,6 +172,9 @@
.setIsptResult(QlyIsptResult.getDescVal(orderTemplate.getIsptResult()))
// .setTrackCode(trackCode)
.setBarcode(trackCode)
+ .setPlatOrderCode(orderTemplate.getPlatOrderCode())
+ .setPlatWorkCode(orderTemplate.getPlatWorkCode())
+ .setProjectCode(orderTemplate.getProjectCode())
.setPoCode(orderTemplate.getPoCode())
.setPurUnit(matnr.getUnit())
.setCreateBy(loginUserId)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyInspectServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyInspectServiceImpl.java
index 8478f24..d2318b0 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyInspectServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyInspectServiceImpl.java
@@ -113,7 +113,7 @@
.select("asn_id as id, SUM(anfme) anfme, SUM(qty) qty, area_id, area_name, asn_code, asn_id, splr_id, splr_batch")
.eq(StringUtils.isNotBlank(code), "asn_code", code)
.lambda()
- .isNull(WarehouseAreasItem::getIsptResult)
+// .isNull(WarehouseAreasItem::getIsptResult)
.lt(WarehouseAreasItem::getWorkQty, 1)
.lt(WarehouseAreasItem::getQty, 1)
.groupBy(WarehouseAreasItem::getAsnCode));
@@ -176,11 +176,15 @@
.setIspectId(inspect.getId())
.setRcptQty(orderItem.getAnfme())
.setRcptId(orderItem.getId())
+ .setPlatOrderCode(orderItem.getPlatOrderCode())
+ .setPlatWorkCode(orderItem.getPlatWorkCode())
+ .setProjectCode(orderItem.getProjectCode())
.setAnfme(0.0)
.setFieldsIndex(orderItem.getFieldsIndex())
.setSplrBatch(orderItem.getSplrBatch())
.setSplrName(orderItem.getSplrId$())
.setCreateBy(loginUserId)
+ .setUpdateBy(loginUserId)
.setDlyQty(orderItem.getAnfme());
items.add(isptItem);
}
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 c8291e1..c3beacf 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
@@ -331,6 +331,10 @@
.setOrderType(OrderType.ORDER_IN.type)
.setSource(item.getId())
.setTrackCode(item.getTrackCode())
+ .setPlatItemId(item.getPlatItemId())
+ .setPlatOrderCode(item.getPlatOrderCode())
+ .setPlatWorkCode(item.getPlatWorkCode())
+ .setProjectCode(item.getProjectCode())
.setCreateBy(loginUserId)
.setUpdateBy(loginUserId)
.setExtendFields(item.getExtendFields())
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 0fde5f0..e035315 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
@@ -118,6 +118,10 @@
.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())
--
Gitblit v1.9.1