chore: 原材料增加采购订单号

packages/app/src/models/request/rawMaterial.ts

@@ -22,6 +22,8 @@ export type GetWarehousingFlowingListParams = {
   supplierId: string;
   /** 真实姓名 */
   realName: string;
+  /** 采购订单号 */
+  orderCode: string;
 } & ListParams;
 
 /** 半成品出库流水 */

packages/app/src/models/request/warehousing.ts

@@ -26,6 +26,8 @@ export type OtherStockInParams = {
   storageLocationCode: string;
   /** 部门编号 */
   departmentId: string;
+  /** 批次 */
+  producDate: string;
 };
 
 /** 其他出库 */

packages/app/src/models/response/rawMaterial.ts

@@ -56,6 +56,8 @@ export type WarehousingListData = {
   storageCode: string;
   /** wbs编号 */
   wbs: string;
+  /** 采购订单号 */
+  orderCode: string;
 };
 
 /** 原材料出库流水 */

packages/app/src/pages/raw-in-stream/context.ts

@@ -15,5 +15,6 @@ export const contextState: OriginalListParams<GetWarehousingFlowingListParams> =
   storageLocationName: '',
   supplierId: '',
   realName: '',
+  orderCode: '',
 };
 export const context = createTableSearchContext(contextState);

packages/app/src/pages/raw-in-stream/filter/index.tsx

@@ -24,6 +24,7 @@ const Filter: FC = function () {
       storageLocationName: '',
       supplierId: '',
       realName: '',
+      orderCode: '',
     },
     true,
   );

packages/app/src/pages/raw-in-stream/filter/state.ts

@@ -12,6 +12,7 @@ export const sourceMap: FilterGroupMap<typeof contextState> = new Map([
 
 export const fixedMap: MapValue<typeof contextState>[] = [
   {label: '入库单编号', type: 'field', value: 'storageCode'},
+  {label: '采购订单号', type: 'field', value: 'orderCode'},
   {label: '物料名称', type: 'field', value: 'materialName'},
   {label: '物料编号', type: 'field', value: 'wllbCode'},
 ];

packages/app/src/pages/raw-in-stream/table/index.tsx

@@ -21,6 +21,12 @@ const columns: ColumnsType<WarehousingListData> = [
     key: 'storageCode',
     width: MIDDLE_TABLE_WIDTH,
   },
+  {
+    title: '采购订单号',
+    dataIndex: 'orderCode',
+    key: 'orderCode',
+    width: MIDDLE_TABLE_WIDTH,
+  },
   {
     title: '物料编号',
     dataIndex: 'wllbCode',
@@ -70,6 +76,12 @@ const columns: ColumnsType<WarehousingListData> = [
     key: 'realName',
     width: NORMAL_TABLE_WIDTH,
   },
+  {
+    title: 'WBS编号',
+    dataIndex: 'wbs',
+    key: 'wbs',
+    width: MIDDLE_TABLE_WIDTH,
+  },
   {
     title: '类型',
     dataIndex: 'type',
@@ -82,12 +94,7 @@ const columns: ColumnsType<WarehousingListData> = [
     key: 'scrq',
     width: MIDDLE_TABLE_WIDTH,
   },
-  {
-    title: 'WBS编号',
-    dataIndex: 'wbs',
-    key: 'wbs',
-    width: MIDDLE_TABLE_WIDTH,
-  },
+
   {
     title: '连番号',
     dataIndex: 'serial',

packages/app/src/pages/stock-in/hooks.ts

@@ -36,6 +36,7 @@ async function submitQuery(params: GetOtherInGetStockInfoParams & {amount: strin
       ...params,
       departmentId: department,
       id: data.list.length > 0 ? data.list[0].id : null,
+      producDate: '',
     };
 
     const result = await otherIn(inParams);