asd

config/routes.js

@@ -35,7 +35,7 @@ export default [
     routes: [
       {
         path: "/wms/instore",
-        name: "入库管理",
+        name: "来料入库",
         component: "./insertstore/Instore",
       },
       {
@@ -50,7 +50,7 @@ export default [
       },
       {
         path: "/wms/outstore",
-        name: "生产叫料单",
+        name: "生产叫料出库",
         component: "./outsetstore/Outstore",
       },
       {

src/pages/Printer/fields.js

@@ -43,6 +43,7 @@ export function getColumns(setDrawer, formRef) {
       dataIndex: "specificationModel",
       fieldProps: {
         disabled: true,
+        placeholder: "",
       },
     },
     {
@@ -51,6 +52,7 @@ export function getColumns(setDrawer, formRef) {
       dataIndex: "shopSign",
       fieldProps: {
         disabled: true,
+        placeholder: "",
       },
     },
     {
@@ -59,6 +61,7 @@ export function getColumns(setDrawer, formRef) {
       dataIndex: "ironLoss",
       fieldProps: {
         disabled: true,
+        placeholder: "",
       },
     },
     {
@@ -67,6 +70,7 @@ export function getColumns(setDrawer, formRef) {
       dataIndex: "sheetThickness",
       fieldProps: {
         disabled: true,
+        placeholder: "",
       },
     },
     {
@@ -82,14 +86,14 @@ export function getColumns(setDrawer, formRef) {
       valueType: "select",
       options: {
         path: "/ngic-auth/sysSupplier/query/selection",
-        params:{}
+        params: {},
       },
     },
     {
       title: "单边厚度",
       key: "unilateralThickness",
       dataIndex: "unilateralThickness",
-      valueType:'digit'
+      valueType: "digit",
     },
     {
       title: "备注",
@@ -98,9 +102,14 @@ export function getColumns(setDrawer, formRef) {
       valueType: "textarea",
     },
     {
-      title: "列表",
+      title: (
+        <span>
+          <b style={{ color: "red" }}>*</b> 列表
+        </span>
+      ),
       valueType: "formList",
       dataIndex: "list",
+      formItemProps: { rules: [{ required: true, message: "此项为必填项" }] },
       initialValue: [
         {
           state: "all",

src/pages/Printer/index.jsx

@@ -120,8 +120,8 @@ const Station = (props) => {
       title: `当前已完成信息填写，是否保存并立即打印？`,
       icon: <ExclamationCircleFilled />,
       width: 500,
-      okText: '确定',
-      cancelText:"取消",
+      okText: "确定",
+      cancelText: "取消",
       onOk() {
         formRef?.current?.validateFields().then((formData) => {
           start("/ngic-workmanship/wmsMaterieLabel/save", formData);
@@ -141,18 +141,22 @@ const Station = (props) => {
   const saveData = (type) => {
     if (type === 1) {
       formRef?.current?.validateFields().then((formData) => {
-        doFetch({
-          url: "/ngic-workmanship/wmsMaterieLabel/save",
-          params: formData,
-        }).then((res) => {
-          if (res?.code == "0000") {
-            setDrawer((v) => ({
-              ...v,
-              visible: false,
-            }));
-          }
-          message.success("保存成功！", 2);
-        });
+        if (formData?.list && formData?.list.length > 0) {
+          doFetch({
+            url: "/ngic-workmanship/wmsMaterieLabel/save",
+            params: formData,
+          }).then((res) => {
+            if (res?.code == "0000") {
+              setDrawer((v) => ({
+                ...v,
+                visible: false,
+              }));
+            }
+          });
+        } else {
+          message.destroy()
+          message.warning("请添加列表数据！",2);
+        }
       });
     } else {
       saveAndPrint();
@@ -170,8 +174,8 @@ const Station = (props) => {
       title: `当前已选择 ${selectIds?.length} 条标签数据，是否全部打印？`,
       icon: <ExclamationCircleFilled />,
       width: 500,
-      okText: '确定',
-      cancelText:"取消",
+      okText: "确定",
+      cancelText: "取消",
       onOk() {
         start("/ngic-workmanship/wmsMaterieLabel/queryByIds", {
           ids: selectIds,

src/pages/Task/index.jsx

@@ -183,7 +183,7 @@ function Outstore(props) {
         {
           title: "单据状态",
           dataIndex: "statusName",
-          key: "statusName",
+          key: "status",
           valueType: "select",
           options: [
             {
@@ -327,7 +327,7 @@ function Outstore(props) {
         {
           title: "单据状态",
           dataIndex: "statusName",
-          key: "statusName",
+          key: "status",
           search: false,
           valueType: "select",
           options: [

src/pages/findstore/Storesearch/index.jsx

@@ -84,7 +84,6 @@ function Instore(props) {
       title: "物料编码",
       dataIndex: "materieId",
       key: "materieId",
-      search: false,
     },
     {
       title: "物料名称",
@@ -101,7 +100,6 @@ function Instore(props) {
       title: "批次号",
       dataIndex: "materieControlNo",
       key: "materieControlNo",
-      search: false,
     },
     {
       title: "库存数量",

src/pages/insertstore/Otherinstore/index.jsx

@@ -60,19 +60,12 @@ const defaultFields = {
       options: {
         database: () =>
           doFetch({
-            url: "/ngic-auth/sysStore/selectionBox",
-            params: { factoryIdList: [] },
+            url: "/ngic-auth/sysStore/selectionBoxAll",
+            params: {},
           }),
         params: {},
       },
     },
-    businessNo: {
-      value: null,
-      type: "input",
-      title: "相关单号",
-      name: ["businessNo"],
-      required: false,
-    },
     remark: {
       value: null,
       type: "textarea",
@@ -95,16 +88,20 @@ const defaultFields = {
           //根据url接口 改变某个value
           database: (params) =>
             doFetch({
-              url: "/ngic-workmanship/pmMaterie/queryUnitByMaterieId",
+              url: "/ngic-workmanship/wmsMaterieLabel/queryById",
               params,
             }),
-          params: { materieId: "linked" },
+          params: { labelId: "linked" },
           effectresult: {
-            productionUnit: "productionUnit", //key 为列表更新值  value为response 返回值
             productionUnitName: "productionUnitName",
-            materieControlNo: "materialCode",
-            instroeNum: "instroeNum",
+            materieCode: "materieCode",
             supplierId: "supplierId",
+            supplierName: "supplierName",
+            width: "width",
+            ironLoss: "ironLoss",
+            sheetThickness: "sheetThickness",
+            shopSign: "shopSign",
+            weight: "weight",
           },
         },
       },
@@ -112,17 +109,17 @@ const defaultFields = {
         {
           title: (
             <span>
-              物料编码-名称 <b style={{ color: "red" }}>*</b>
+              批次号 <b style={{ color: "red" }}>*</b>
             </span>
           ),
-          dataIndex: "materieId",
-          key: "materieId",
+          dataIndex: "labelId",
+          key: "labelId",
           valueType: "select",
           width: 300,
           request: async () => {
             let res = await doFetch({
-              url: "/ngic-workmanship/pmMaterie/query/selectbox",
-              params: {},
+              url: "/ngic-workmanship/wmsMaterieLabel/selectionByStatus",
+              params: { status: "1" },
             });
             return res?.data?.dataList;
           },
@@ -139,56 +136,63 @@ const defaultFields = {
         {
           title: (
             <span>
-              供应商编号-名称 <b style={{ color: "red" }}>*</b>
+              物料编码-名称 <b style={{ color: "red" }}>*</b>
             </span>
           ),
-          dataIndex: "supplierId",
-          key: "supplierId",
+          dataIndex: "materieCode",
+          key: "materieCode",
           valueType: "select",
           width: 300,
-          request: async () => {
-            let res = await doFetch({
-              url: "/ngic-auth/sysSupplier/query/selection/withNo",
-              params: {},
-            });
-            return res?.data?.dataList;
-          },
-          fieldProps: {
-            allowClear: true,
-            showSearch: true,
-          },
-          formItemProps: () => {
-            return {
-              rules: [{ required: true, message: "此项为必填项" }],
-            };
-          },
+          readonly: true,
         },
         {
-          title: "批次号/SN号",
-          dataIndex: "materieControlNo",
-          key: "materieControlNo",
+          title: "规格型号",
+          dataIndex: "specificationModel",
+          key: "specificationModel",
+          readonly: true,
         },
+
         {
-          title: (
-            <span>
-              入库数量 <b style={{ color: "red" }}>*</b>
-            </span>
-          ),
-          dataIndex: "instroeNum",
-          key: "instroeNum",
-          formItemProps: () => {
-            return {
-              rules: [{ required: true, message: "此项为必填项" }],
-            };
-          },
-          valueType: "digit",
+          title: "供应商",
+          dataIndex: "supplierName",
+          key: "supplierName",
+          readonly: "supplierName",
+        },
+        {
+          title: "宽度",
+          dataIndex: "width",
+          key: "width",
+          readonly: "width",
+        },
+        {
+          title: "铁损",
+          dataIndex: "ironLoss",
+          key: "ironLoss",
+          readonly: "ironLoss",
+        },
+        {
+          title: "片厚",
+          dataIndex: "sheetThickness",
+          key: "sheetThickness",
+          readonly: "sheetThickness",
+        },
+        {
+          title: "牌号",
+          dataIndex: "shopSign",
+          key: "shopSign",
+          readonly: "shopSign",
+        },
+        {
+          title: "入库数量",
+          dataIndex: "weight",
+          key: "weight",
+          readonly: "weight",
         },
         {
           title: "库存单位",
           dataIndex: "productionUnitName",
           key: "productionUnitName",
           readonly: "productionUnitName",
-          width: 88,
         },
         {
           title: "操作",
@@ -1026,7 +1030,7 @@ function Instore(props) {
           if (drawprops.val == "add") {
             let res = await doFetch({
               url: "/ngic-workmanship/wmsMaterieInstore/saveInStore",
-              params: { ...value, instoreType: drawprops.instoreType },
+              params: { ...value },
             });
             if (res.code == "0000") {
               reload();

src/pages/outsetstore/Outstore/index.jsx

@@ -212,7 +212,7 @@ function Outstore(props) {
           key: "applyTimeList",
           valueType: "dateRange",
           formItemProps: {
-            name: "createTimeList",
+            name: "applyTimeList",
           },
         },
         {
@@ -328,7 +328,7 @@ function Outstore(props) {
           search: false,
           valueType: "dateRange",
           formItemProps: {
-            name: "createTimeList",
+            name: "applyTimeList",
           },
         },
         {