Skip to content

W
wms
Commit 7daae505 authored by krysent's avatar krysent
Browse files
Options

bug

parent 66b2a489
Hide whitespace changes
Inline Side-by-side
Showing with 115 additions and 202 deletions
src/components/PrintCode/index.jsx
View file @ 7daae505
......@@ -68,7 +68,7 @@ let PrintQrCode = forwardRef(({ selectedItems }, ref) => {
<b>物料名称: </b> <span>{item.materieName}</span>
</p>
<p>
<b>批次号/SN号: </b> <span>{item.materieControlNo}</span>
<b>批次号: </b> <span>{item.materieControlNo}</span>
</p>
<p>
<b>供应商: </b> <span>{item.supplierName}</span>
......
src/pages/Movestore/fields.js
View file @ 7daae505
......@@ -96,7 +96,7 @@ const EditUpload = ({ record, fid, storeId }) => {
},
},
{
title: "批次号/SN号",
title: "批次号",
dataIndex: "materieControlNo",
key: "materieControlNo",
search: false,
......@@ -804,7 +804,7 @@ const one = {
},
},
{
title: "批次号/SN号",
title: "批次号",
dataIndex: "materieControlNo",
key: "materieControlNo",
search: false,
......@@ -917,7 +917,7 @@ const one = {
},
},
{
title: "批次号/SN号",
title: "批次号",
dataIndex: "materieControlNo",
key: "materieControlNo",
search: false,
......
src/pages/Movestore/index.jsx
View file @ 7daae505
......@@ -107,42 +107,8 @@ function Outstore(props) {
return [
{
title: "单据编号",
dataIndex: "materieInstoreNo",
key: "materieInstoreNo",
render: (dom, record) => {
return (
<a
onClick={() => {
const detail = defaultFields.detail(
setSelectKeys,
PrintButton
);
setdrawprops((s) => ({
...s,
visible: true,
//查看详情 props
val: "detail",
title: `查看详情`,
...detail,
totalPath:
"/ngic-workmanship/wmsMaterieInstore/getInStoreInfoById",
totalParams: { id: record.id },
extra: (
<Button
onClick={async () => {
handlePrint();
}}
>
打印
</Button>
),
}));
}}
>
{dom}
</a>
);
},
dataIndex: "documentsCode",
key: "documentsCode",
},
{
title: "操作时间",
......@@ -150,7 +116,6 @@ function Outstore(props) {
key: "operateTimeList",
width: 300,
valueType: "dateRange",
search: false,
render: (_, row) => {
return <div>{row.operateTime}</div>;
},
......@@ -163,181 +128,114 @@ function Outstore(props) {
{
title: "单据类型",
dataIndex: "instoreTypeName",
search: false,
key: "instoreType",
},
{
title: "物料编码",
dataIndex: "materieCode",
search: false,
key: "materieCode",
},
{
title: "物料名称",
dataIndex: "materieName",
search: false,
key: "materieName",
},
{
title: "批次号",
dataIndex: "materieControlNo",
search: false,
key: "materieControlNo",
},
{
title: "库存数量",
dataIndex: "stockNum",
key: "stockNum",
dataIndex: "stockNumNow",
key: "stockNumNow",
search: false,
},
{
title: "来源库位",
dataIndex: "storeName",
dataIndex: "sourceStorePositionName",
search: false,
key: "storeId",
fieldProps: {
allowClear: true,
showSearch: true,
},
key: "sourceStorePositionName",
},
{
title: "目标库位",
dataIndex: "remark",
search: false,
key: "remark",
search: false,
dataIndex: "targetStorePositionName",
key: "targetStorePositionName",
},
{
title: "单据状态",
dataIndex: "statusName",
key: "status",
valueType: "select",
options: [
{
label: "执行中",
value: "7",
},
{
label: "待分配",
value: "5",
},
{
label: "待执行",
value: "6",
},
],
dataIndex: "documentsState",
key: "documentsState",
search: false,
},
];
} else {
return [
{
title: "入库单号",
dataIndex: "materieInstoreNo",
key: "materieInstoreNo",
render: (dom, record) => {
return (
<a
onClick={() => {
const detail = defaultFields.detail(
setSelectKeys,
PrintButton
);
setdrawprops((s) => ({
...s,
visible: true,
//查看详情 props
val: "detail",
title: `查看详情`,
...detail,
totalPath:
"/ngic-workmanship/wmsMaterieInstoreHis/getInStoreInfoById",
totalParams: { id: record.id },
extra: (
<Button
onClick={async () => {
handlePrint();
}}
>
打印
</Button>
),
}));
}}
>
{dom}
</a>
);
title: "单据编号",
dataIndex: "documentsCode",
key: "documentsCode",
},
{
title: "完成时间",
dataIndex: "finishTime",
key: "finishTimeRange",
width: 300,
valueType: "dateRange",
render: (_, row) => {
return <div>{row.operateTime}</div>;
},
},
{
title: "入库类型",
dataIndex: "instoreTypeName",
key: "instoreType",
valueType: "select",
options: [
{
label: "来料入库",
value: "2",
},
{
label: "退料入库",
value: "3",
},
],
title: "操作人",
dataIndex: "operateUserName",
key: "operateUserName",
},
{
title: "入库仓库",
dataIndex: "storeName",
title: "物料编码",
dataIndex: "materieCode",
search: false,
key: "storeId",
fieldProps: {
allowClear: true,
showSearch: true,
},
key: "materieCode",
},
{
title: "备注",
dataIndex: "remark",
key: "remark",
title: "物料名称",
dataIndex: "materieName",
search: false,
key: "materieName",
},
{
title: "创建人",
dataIndex: "createUserName",
key: "createUserName",
title: "批次号",
dataIndex: "materieControlNo",
search: false,
key: "materieControlNo",
},
{
title: "创建时间",
dataIndex: "createTime",
key: "createTimeList",
title: "库存数量",
dataIndex: "stockNumNow",
key: "stockNumNow",
search: false,
valueType: "dateRange",
formItemProps: {
name: "createTimeList",
},
},
{
title: "完成时间",
dataIndex: "finishTime",
title: "来源库位",
dataIndex: "sourceStorePositionName",
search: false,
key: "finishTime",
valueType: "dateRange",
formItemProps: {
name: "finishTimeList",
},
key: "sourceStorePositionName",
},
{
title: "目标库位",
dataIndex: "targetStorePositionName",
key: "targetStorePositionName",
},
{
title: "状态",
dataIndex: "statusName",
key: "status",
valueType: "select",
options: [
{
label: "已关单",
value: "4",
},
{
label: "已完成",
value: "8",
},
],
title: "单据状态",
dataIndex: "documentsState",
key: "documentsState",
search: false,
},
];
}
......@@ -386,8 +284,8 @@ function Outstore(props) {
columns,
path:
activeTabKey == "1"
? "/ngic-workmanship/wmsMaterieInstore/queryList"
: "/ngic-workmanship/wmsMaterieInstoreHis/queryList",
? "/ngic-workmanship/wmsMoveStock/queryList"
: "/ngic-workmanship/wmsMoveStockHis/queryList",
};
return (
......
src/pages/Task/fields.js
View file @ 7daae505
......@@ -96,7 +96,7 @@ const EditUpload = ({ record, fid, storeId }) => {
},
},
{
title: "批次号/SN号",
title: "批次号",
dataIndex: "materieControlNo",
key: "materieControlNo",
search: false,
......@@ -831,7 +831,7 @@ const one = {
},
},
{
title: "批次号/SN号",
title: "批次号",
dataIndex: "materieControlNo",
key: "materieControlNo",
search: false,
......@@ -933,7 +933,7 @@ const one = {
},
},
{
title: "批次号/SN号",
title: "批次号",
dataIndex: "materieControlNo",
key: "materieControlNo",
search: false,
......
src/pages/findstore/Storesearch/indexcopy.jsx
View file @ 7daae505
......@@ -86,7 +86,7 @@ const Storesearch = (props) => {
// "key": "storePositionName"
// },
// {
// "title": "批次号/SN号",
// "title": "批次号",
// "dataIndex": "materieControlNo",
// "key": "materieControlNo"
// },
......
src/pages/insertstore/Instore/fields.js
View file @ 7daae505
......@@ -96,7 +96,7 @@ const EditUpload = ({ record, fid, storeId }) => {
},
},
{
title: "批次号/SN号",
title: "批次号",
dataIndex: "materieControlNo",
key: "materieControlNo",
search: false,
......@@ -804,7 +804,7 @@ const one = {
},
},
{
title: "批次号/SN号",
title: "批次号",
dataIndex: "materieControlNo",
key: "materieControlNo",
search: false,
......@@ -917,7 +917,7 @@ const one = {
},
},
{
title: "批次号/SN号",
title: "批次号",
dataIndex: "materieControlNo",
key: "materieControlNo",
search: false,
......
src/pages/insertstore/Otherinstore/fields.js
View file @ 7daae505
......@@ -222,7 +222,7 @@ const one = {
},
},
{
"title": "批次号/SN号",
"title": "批次号",
"dataIndex": "materieControlNo",
"key": "materieControlNo"
},
......@@ -360,7 +360,7 @@ const one = {
},
},
{
"title": "批次号/SN号",
"title": "批次号",
"dataIndex": "materieControlNo",
"key": "materieControlNo"
},
......@@ -503,7 +503,7 @@ const one = {
},
},
{
"title": "批次号/SN号",
"title": "批次号",
"dataIndex": "materieControlNo",
"key": "materieControlNo"
},
......@@ -646,7 +646,7 @@ const one = {
},
},
{
"title": "批次号/SN号",
"title": "批次号",
"dataIndex": "materieControlNo",
"key": "materieControlNo"
},
......@@ -761,7 +761,7 @@ const one = {
}
},
{
title: "批次号/SN号",
title: "批次号",
dataIndex: "materieControlNo",
key: "materieControlNo",
search: false,
......@@ -868,7 +868,7 @@ const one = {
}
},
{
title: "批次号/SN号",
title: "批次号",
dataIndex: "materieControlNo",
key: "materieControlNo",
search: false,
......@@ -1014,7 +1014,7 @@ const one = {
}
},
{
title: "批次号/SN号",
title: "批次号",
dataIndex: "materieControlNo",
key: "materieControlNo",
search: false,
......
src/pages/insertstore/Otherinstore/index.jsx
View file @ 7daae505
......@@ -330,6 +330,13 @@ function Instore(props) {
width: 160,
valueType: "select",
readonly: true,
renderFormItem: ({ entry }) => {
return (
<span>
{entry?.materieCode}-{entry?.materieName}
</span>
);
},
},
{
title: "规格型号",
......@@ -479,7 +486,7 @@ function Instore(props) {
},
},
{
title: "批次号/SN号",
title: "批次号",
dataIndex: "materieControlNo",
key: "materieControlNo",
search: false,
......@@ -600,7 +607,7 @@ function Instore(props) {
},
},
{
title: "批次号/SN号",
title: "批次号",
dataIndex: "materieControlNo",
key: "materieControlNo",
search: false,
......@@ -990,19 +997,27 @@ function Instore(props) {
},
}),
getPrem("equipmentCustomer_deleteById", action, "删除", null, {
title: "确认删除？",
onConfirm: () => {
doFetch({
url: "/ngic-workmanship/wmsMaterieInstore/deleteById",
params: { id: record.id },
}).then((res) => {
if (res.code == "0000") {
reload();
record?.status === 7
? null
: getPrem(
"equipmentCustomer_deleteById",
action,
"删除",
null,
{
title: "确认删除？",
onConfirm: () => {
doFetch({
url: "/ngic-workmanship/wmsMaterieInstore/deleteById",
params: { id: record.id },
}).then((res) => {
if (res.code == "0000") {
reload();
}
});
},
}
});
},
}),
),
];
},
},
......
src/pages/insertstore/Otherinstore/printdom.jsx
View file @ 7daae505
......@@ -66,7 +66,7 @@ let columns = [
},
},
{
title: "批次号/SN号",
title: "批次号",
dataIndex: "materieControlNo",
key: "materieControlNo",
search: false,
......
src/pages/outsetstore/Otheroutstore/fields.js
View file @ 7daae505
......@@ -96,7 +96,7 @@ const EditUpload = ({ record, fid, storeId, formRef }) => {
},
},
{
title: "批次号/SN号",
title: "批次号",
dataIndex: "materieControlNo",
key: "materieControlNo",
search: false,
......@@ -831,7 +831,7 @@ const one = {
},
},
{
title: "批次号/SN号",
title: "批次号",
dataIndex: "materieControlNo",
key: "materieControlNo",
search: false,
......@@ -933,7 +933,7 @@ const one = {
},
},
{
title: "批次号/SN号",
title: "批次号",
dataIndex: "materieControlNo",
key: "materieControlNo",
search: false,
......
src/pages/outsetstore/Otheroutstore/index.jsx
View file @ 7daae505
......@@ -337,7 +337,7 @@ const defaultFields = {
},
},
{
title: "批次号/SN号",
title: "批次号",
dataIndex: "materieControlNo",
key: "materieControlNo",
search: false,
......@@ -439,7 +439,7 @@ const defaultFields = {
},
},
{
title: "批次号/SN号",
title: "批次号",
dataIndex: "materieControlNo",
key: "materieControlNo",
search: false,
......@@ -818,11 +818,11 @@ function Outstore(props) {
valueType: "select",
options: [
{
label: "待下架",
label: "待执行",
value: "0",
},
{
label: "下架中",
label: "执行中",
value: "1",
},
],
......
src/pages/outsetstore/Outstore/fields.js
View file @ 7daae505
......@@ -79,7 +79,7 @@ const EditUpload = ({ record, fid, storeId }) => {
},
},
{
title: "批次号/SN号",
title: "批次号",
dataIndex: "materieControlNo",
key: "materieControlNo",
search: false,
......@@ -753,7 +753,7 @@ const one = {
},
},
{
title: "批次号/SN号",
title: "批次号",
dataIndex: "materieControlNo",
key: "materieControlNo",
search: false,
......@@ -848,7 +848,7 @@ const one = {
},
},
{
title: "批次号/SN号",
title: "批次号",
dataIndex: "materieControlNo",
key: "materieControlNo",
search: false,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment