需求修改

utils/getData2.js

@@ -24,13 +24,13 @@ export const getBillsCount = (area) => request({
  * 出入库
  */
 // 1.分页查询出入库单据
-export const easOutInBillPage = (fuzzy, djlx, djzt, ckbm, page, size) => request({
+export const easOutInBillPage = (fuzzy, djlx, ckbm, cgybm, page, size) => request({
 	url:'api/easOutInBill/page',
 	data: {
 		fuzzy: fuzzy,
 		djlx: djlx,
-		djzt: djzt,
 		ckbm: ckbm,
+		cgybm: cgybm,
 		page: page,
 		size: size
 	}
@@ -59,6 +59,16 @@ export const easOutInBillDetailUpdate = (arr) => request({
 	url:'api/easOutInBillDetail/update',
 	data: arr
 })
+// 6.获取仓管员信息 ------ 下拉框带搜索功能
+export const getUserInfo = () => request({
+	url:'api/easOutInBill/getUserInfo',
+	data: {}
+})
+// 7.获取组织机构信息 ------ 下拉框带搜索功能
+export const getOrganizationInfo = () => request({
+	url:'api/easOutInBill/getOrganizationInfo',
+	data: {}
+})
 
 /**
  * 调拨维护
@@ -69,11 +79,12 @@ export const getWarehouseInfo = () => request({
 	data: {}
 })
 // 2.查询调拨单据
-export const allocationPage = (fuzzy, ckbm, page, size) => request({
+export const allocationPage = (fuzzy, kczzbm, cgybm, page, size) => request({
 	url:'api/allocationBill/allocationPage',
 	data: {
 		fuzzy: fuzzy,
-		ckbm: ckbm,
+		kczzbm: kczzbm,
+		cgybm: cgybm,
 		page: page,
 		size: size
 	}
@@ -97,16 +108,21 @@ export const allocationBillConfirm = (arr) => request({
 	url:'api/allocationBill/confirm',
 	data: arr
 })
+// 6.根据跟踪号查询库存列表
+export const allocationBillInventoryInfo = (arr) => request({
+	url:'api/allocationBill/queryInventoryInfo',
+	data: arr
+})
 
 /**
  * 收货确认
  */
 // 1.收货单据分页
-export const receiptPage = (fuzzy, ckbm, page, size) => request({
+export const receiptPage = (fuzzy, kczzbm, page, size) => request({
 	url:'api/receiptBill/receiptPage',
 	data: {
 		fuzzy: fuzzy,
-		ckbm: ckbm,
+		kczzbm: kczzbm,
 		page: page,
 		size: size
 	}

utils/mork2.js

@@ -539,6 +539,32 @@ export const getWarehouseInfo = () => {
 	}
 	return res
 }
+export const getUserInfo = () => {
+	let res = {
+		"result": [
+			{
+				"cgybm": "1",
+				"cgymc": "admin"
+			}
+		],
+		"code": 1,
+		"desc": "查询成功"
+	}
+	return res
+}
+export const getOrganizationInfo = () => {
+	let res = {
+		"result": [
+			{
+				"kczzbm": "a110",
+				"kczzmc": "管理部"
+			}
+		],
+		"code": 1,
+		"desc": "查询成功"
+	}
+	return res
+}
 export const allocationPage = () => {
 	let res = {
 		"pageNum": 1,
@@ -581,7 +607,7 @@ export const allocationPage = () => {
 				"drckmc": "销售成品仓-浙江大区",
 				"drkwbm": null,
 				"drkwmc": null,
-				"gzh": null,
+				"gzh": 'aljljdljf',
 				"jhdrrq": "2024-05-01",
 				"jhdcrq": "2024-05-02",
 				"flbz": null
@@ -994,7 +1020,7 @@ export const allocationBillPage = () => {
 				"drckmc": "销售配件仓",
 				"drkwbm": null,
 				"drkwmc": null,
-				"gzh": null,
+				"gzh": 'djlfjlfjlfj',
 				"jhdrrq": "2024-05-01",
 				"jhdcrq": "2024/05/08 17:09:47",
 				"flbz": null
@@ -1059,6 +1085,75 @@ export const allocationBillConfirm = () => {
 	}
 	return res
 }
+export const allocationBillInventoryInfo = () => {
+	let res = {
+		code: 1,
+		desc: 'ok',
+		result: [
+			{
+				"locationNo": "01.09.07",
+				"locationName": "四期智能工厂",
+				"materialNo": "255025010002",
+				"materialName": "多路阀(三联晨光)",
+				"lot": '20201010',
+				"unitNo": "PCS",
+				"curStoreQty": "2",
+				"warehouseNo": "3.04.001",
+				"warehouseName": "智能原材料库",
+				"trackNo": '1'
+			},
+			{
+				"locationNo": "01.09.07",
+				"locationName": "四期智能工厂",
+				"materialNo": "255025010002",
+				"materialName": "多路阀(三联晨光)",
+				"lot": '20201010',
+				"unitNo": "PCS",
+				"curStoreQty": "2",
+				"warehouseNo": "3.04.001",
+				"warehouseName": "智能原材料库",
+				"trackNo": '2'
+			},
+			{
+				"locationNo": "01.09.07",
+				"locationName": "四期智能工厂",
+				"materialNo": "255025010002",
+				"materialName": "多路阀(三联晨光)",
+				"lot": '20201010',
+				"unitNo": "PCS",
+				"curStoreQty": "2",
+				"warehouseNo": "3.04.001",
+				"warehouseName": "智能原材料库",
+				"trackNo": '3'
+			},
+			{
+				"locationNo": "01.09.07",
+				"locationName": "四期智能工厂",
+				"materialNo": "255025010002",
+				"materialName": "多路阀(三联晨光)",
+				"lot": '20201010',
+				"unitNo": "PCS",
+				"curStoreQty": "2",
+				"warehouseNo": "3.04.001",
+				"warehouseName": "智能原材料库",
+				"trackNo": '4'
+			},
+			{
+				"locationNo": "01.09.07",
+				"locationName": "四期智能工厂",
+				"materialNo": "255025010002",
+				"materialName": "多路阀(三联晨光)",
+				"lot": '20201010',
+				"unitNo": "PCS",
+				"curStoreQty": "2",
+				"warehouseNo": "3.04.001",
+				"warehouseName": "智能原材料库",
+				"trackNo": '5'
+			}
+		]
+	}
+	return res
+}
 export const receiptPage = () => {
 	let res = {
 		"pageNum": 1,