From d65b7cfdc47b99251b006965b2f49a2e2b85bd1e Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Mon, 29 Jul 2024 13:55:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=88=E8=BF=9B=E5=85=88?=
=?UTF-8?q?=E5=87=BA=E5=8F=91=E6=96=99=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/request2.js | 83 +-
src/pages.json | 2 +-
src/pages/issue/coms/comIssueRequestPopup.vue | 4 +-
src/pages/issue/record/issueRecord.vue | 964 ++++++++++++------
src/pages/issue/record/issueRecordV1.vue | 432 ++++++++
.../repleinsh/record/repleinshRecord.vue | 2 +-
6 files changed, 1145 insertions(+), 342 deletions(-)
create mode 100644 src/pages/issue/record/issueRecordV1.vue
diff --git a/src/api/request2.js b/src/api/request2.js
index b49c8a03..163e023e 100644
--- a/src/api/request2.js
+++ b/src/api/request2.js
@@ -2,7 +2,7 @@ import request from './httpRequest3.js'
import storage from '../common/utils/storage.js'
//公司地址
// 本地地址
-const baseApi = ''
+const baseApi = ''
/**
* 获取验证码
* @param {*}
@@ -17,7 +17,7 @@ export function getCaptchaImage(params) {
/**
* 登录方法
*/
-export function login(username, password, code, uuid,tenantName) {
+export function login(username, password, code, uuid, tenantName) {
return request({
url: baseApi + '/system/auth/login',
headers: {
@@ -178,7 +178,7 @@ export function getMessageUnreadCount() {
* 获取单据开关配置
*/
export function getSwitchByCode(params) {
-
+
return request({
url: baseApi + "/wms/switch/getSwitchList",
method: "post",
@@ -443,9 +443,9 @@ export function getPackageListByNumber(number) {
export function getMesPackInfo(code) {
var params = {
filters: [{
- column:"lowerLim",
- action:"==",
- value:code
+ column: "lowerLim",
+ action: "==",
+ value: code
}],
pageNo: 1,
pageSize: 10
@@ -1363,7 +1363,7 @@ export function getProductionReceiptJobByProductionline() {
data: {},
});
}
-
+
/**
* 发料任务明细
* @param {*} 任务id
@@ -1383,10 +1383,10 @@ export function getIssueJobDetail(id) {
* @param {*} 任务id
* /wms/issue-request-main
*/
-export function getBalanceByBatchOffShelf(itemCode, qty) {
+export function getBalanceByBatchOffShelf(itemCode, qty, businesstype) {
return request({
url: baseApi + "/wms/issue-request-main/getBalanceByBatchOffShelf?itemCode=" + itemCode + "&&qty=" +
- qty,
+ qty + "&&businesstype=" + businesstype,
method: "get",
data: {},
});
@@ -4116,7 +4116,7 @@ export function getMainMessage() {
*/
export function appCheckUpdate() {
return request({
- url: baseApi+"/wms/system-install-package/returnNewFile",
+ url: baseApi + "/wms/system-install-package/returnNewFile",
method: "get",
data: {}
})
@@ -4209,10 +4209,10 @@ export function getPackageLabel(packageCode) {
name: name,
pageNo: 1,
pageSize: 10,
- sort:"",
- filters:[{
+ sort: "",
+ filters: [{
action: "==",
- column:"relateNumber",
+ column: "relateNumber",
value: packageCode
}]
}
@@ -4229,7 +4229,7 @@ export function getPackageLabel(packageCode) {
*/
export function isCheckMesCode(code) {
return request({
- url: baseApi + "/wms/productreceipt-detailb/getCheckWhetherItExists?remark="+code,
+ url: baseApi + "/wms/productreceipt-detailb/getCheckWhetherItExists?remark=" + code,
method: "get",
data: {},
});
@@ -4239,11 +4239,11 @@ export function isCheckMesCode(code) {
* 获取上架任务打印明细
* @param {*}
*/
-export function getJimuPutawayJobDetail(data) {
- return request({
+export function getJimuPutawayJobDetail(data) {
+ return request({
url: baseApi + "/wms/jimu-report/getPutawayJobDetailForPDA",
method: "post",
- data:data
+ data: data
});
}
@@ -4251,11 +4251,11 @@ export function getJimuPutawayJobDetail(data) {
* 查询库位,后台自己查询管理模式
* @param {*}
*/
-export function getBalanceByParams(data) {
- return request({
+export function getBalanceByParams(data) {
+ return request({
url: baseApi + "/wms/balance/getBalanceListByPackage",
method: "post",
- data:data
+ data: data
});
}
@@ -4264,11 +4264,11 @@ export function getBalanceByParams(data) {
* @param {*}
*/
-export function getBusinessType() {
- return request({
+export function getBusinessType() {
+ return request({
url: baseApi + "/wms/businesstype/page?pageSize=1000&pageNo=1",
method: "get",
- data:{}
+ data: {}
});
}
@@ -4277,11 +4277,12 @@ export function getBusinessType() {
* @param {*}
*/
-export function getPlaneInfoByproductLine(productionLine,planDate) {
- return request({
- url: baseApi + "/wms/production-main/getPlanProductionByProductionLineAndPlanDate?productionLine="+productionLine+"&planDate="+planDate,
+export function getPlaneInfoByproductLine(productionLine, planDate) {
+ return request({
+ url: baseApi + "/wms/production-main/getPlanProductionByProductionLineAndPlanDate?productionLine=" +
+ productionLine + "&planDate=" + planDate,
method: "get",
- data:{}
+ data: {}
});
}
@@ -4290,33 +4291,33 @@ export function getPlaneInfoByproductLine(productionLine,planDate) {
* @param {*}
*/
-export function planReceiptSubmit(params) {
- return request({
+export function planReceiptSubmit(params) {
+ return request({
url: baseApi + "/wms/productreceipt-record-main/createByPlan",
method: "post",
- data:params
+ data: params
});
}
/**
* @param {Object} params 创建计划完工后调用上架申请 number
*/
-export function createPutawayRequestByPlan(number) {
- return request({
- url: baseApi + "/wms/productreceipt-record-main/createPutawayRequest?number="+number,
+export function createPutawayRequestByPlan(number) {
+ return request({
+ url: baseApi + "/wms/productreceipt-record-main/createPutawayRequest?number=" + number,
method: "post",
- data:{}
+ data: {}
});
}
/**
* @param {Object} params 创建检验申请 number
*/
-export function createInspectRequestByPlan(number) {
- return request({
- url: baseApi + "/wms/productreceipt-record-main/createInspectRequest?number="+number,
+export function createInspectRequestByPlan(number) {
+ return request({
+ url: baseApi + "/wms/productreceipt-record-main/createInspectRequest?number=" + number,
method: "post",
- data:{}
+ data: {}
});
}
@@ -4324,11 +4325,11 @@ export function createInspectRequestByPlan(number) {
/**
* @param {Object} params 查询计划报工单号 number
*/
-export function getPlanByNumber(params) {
- return request({
+export function getPlanByNumber(params) {
+ return request({
url: baseApi + "/wms/production-detail/senior",
method: "post",
- data:params
+ data: params
});
}
diff --git a/src/pages.json b/src/pages.json
index 4f875fc9..57d38d42 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -593,7 +593,7 @@
{
"path": "pages/issue/record/issueRecord",
"style": {
- "navigationBarTitleText": "直接发料记录",
+ "navigationBarTitleText": "先进先出发料",
"enablePullDownRefresh": false,
"titleNView": {
"autoBackButton": "true"
diff --git a/src/pages/issue/coms/comIssueRequestPopup.vue b/src/pages/issue/coms/comIssueRequestPopup.vue
index 6c5bacd4..3b20dfe4 100644
--- a/src/pages/issue/coms/comIssueRequestPopup.vue
+++ b/src/pages/issue/coms/comIssueRequestPopup.vue
@@ -39,7 +39,7 @@
- 位置:
+ 目标位置:
{{positionInfo}}
@@ -51,7 +51,7 @@
- 物料:
+ 需求物料:
{{itemCode}}
diff --git a/src/pages/issue/record/issueRecord.vue b/src/pages/issue/record/issueRecord.vue
index 478b634c..f40a8116 100644
--- a/src/pages/issue/record/issueRecord.vue
+++ b/src/pages/issue/record/issueRecord.vue
@@ -1,218 +1,379 @@
-
-
+
+
-
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/src/pages/issue/record/issueRecordV1.vue b/src/pages/issue/record/issueRecordV1.vue
new file mode 100644
index 00000000..478b634c
--- /dev/null
+++ b/src/pages/issue/record/issueRecordV1.vue
@@ -0,0 +1,432 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/repleinsh/record/repleinshRecord.vue b/src/pages/repleinsh/record/repleinshRecord.vue
index ddd06aeb..6e6c1ef4 100644
--- a/src/pages/repleinsh/record/repleinshRecord.vue
+++ b/src/pages/repleinsh/record/repleinshRecord.vue
@@ -251,7 +251,7 @@
itemCode: result.package.itemCode,
qty: result.package.qty,
}
- getBalanceByBatchOffShelf(item.itemCode, item.qty).then(res => {
+ getBalanceByBatchOffShelf(item.itemCode, item.qty, "Repleinment").then(res => {
if (res.data == null) {
that.showErrorMessage('未获取到推荐信息');
} else {