diff --git a/api/httpRequest3.js b/api/httpRequest3.js
index 51075ab7..d51a546d 100644
--- a/api/httpRequest3.js
+++ b/api/httpRequest3.js
@@ -52,5 +52,7 @@ function service(options = {}) {
uni.request(options);
});
}
+
+
export default service;
diff --git a/api/index.js b/api/index.js
index 0552cfaa..ab6423f7 100644
--- a/api/index.js
+++ b/api/index.js
@@ -1226,3 +1226,7 @@ export const issueDirect = (params) => request(
data: params,
method: "post"
});
+
+
+
+
diff --git a/api/request2.js b/api/request2.js
index dfbf8ad3..d5348b3d 100644
--- a/api/request2.js
+++ b/api/request2.js
@@ -1,4 +1,5 @@
import request from '@/api/httpRequest3.js'
+import storage from '@/common/utils/storage'
// const baseApi = "/api/admin-api"
//公司地址
// 本地地址
@@ -624,7 +625,7 @@ export function getPurchaseReturnRequestDetail(id) {
*/
export function purchaseReturnRequestClose(id) {
return request({
- url: baseApi + "/wms/purchasereturn-request-main/close?id="+id,
+ url: baseApi + "/wms/purchasereturn-request-main/close?id=" + id,
method: "put",
data: {},
});
@@ -634,9 +635,9 @@ export function purchaseReturnRequestClose(id) {
* 采购退货申请 提交审批
* @param {*} params
*/
-export function purchaseReturnRequestSubmitApprove(id) {
+export function purchaseReturnRequestApprove(id) {
return request({
- url: baseApi + "/wms/purchasereturn-request-main/submit?id="+id,
+ url: baseApi + "/wms/purchasereturn-request-main/submit?id=" + id,
method: "put",
data: {},
});
@@ -646,9 +647,9 @@ export function purchaseReturnRequestSubmitApprove(id) {
* 采购退货申请 提交审批通过
* @param {*} params
*/
-export function purchaseReturnRequestSubmitApproveAgree(id) {
+export function purchaseReturnRequestApproveAgree(id) {
return request({
- url: baseApi + "/wms/purchasereturn-request-main/agree?id="+id,
+ url: baseApi + "/wms/purchasereturn-request-main/agree?id=" + id,
method: "put",
data: {},
});
@@ -658,9 +659,9 @@ export function purchaseReturnRequestSubmitApproveAgree(id) {
* 采购退货申请 审批驳回
* @param {*} params
*/
-export function purchaseReturnRequestSubmitApproveRefused(id) {
+export function purchaseReturnRequestApproveRefused(id) {
return request({
- url: baseApi + "/wms/purchasereturn-request-main/refused?id="+id,
+ url: baseApi + "/wms/purchasereturn-request-main/refused?id=" + id,
method: "put",
data: {},
});
@@ -672,7 +673,7 @@ export function purchaseReturnRequestSubmitApproveRefused(id) {
*/
export function purchaseReturnRequestHandle(id) {
return request({
- url: baseApi + "/wms/purchasereturn-request-main/handle?id="+id,
+ url: baseApi + "/wms/purchasereturn-request-main/handle?id=" + id,
method: "put",
data: {},
});
@@ -683,7 +684,7 @@ export function purchaseReturnRequestHandle(id) {
* 采购退货申请 提交
* @param {*} params
*/
-export function purchaseReturnRequestSubmit(params) {
+export function purchaseReturnRequestCreate(params) {
return request({
url: baseApi + "/wms/purchasereturn-request-main/create",
method: "post",
@@ -1163,39 +1164,39 @@ export function getCountJobDetail(id) {
}
/**
- * 盘点 任务承接
+ * 盘点任务 任务承接
* @param {*} id
*
*/
export function takeCountJob(id) {
return request({
- url: baseApi + "/wms/purchasereceipt-job-main/accept?id=" + id,
+ url: baseApi + "/wms/count-job-main/accept?id=" + id,
method: "put",
data: {},
});
}
/**
- * 盘点 放弃承接
+ * 盘点任务 放弃承接
* @param {*} id
*
*/
export function cancleTakeCountJob(id) {
return request({
- url: baseApi + "/wms/purchasereceipt-job-main/abandon?id=" + id,
+ url: baseApi + "/wms/count-job-main/abandon?id=" + id,
method: "put",
data: {},
});
}
/**
- * 盘点 任务提交
+ * 盘点任务 提交
* @param {*} 任务id
*
*/
export function countJobSubmit(params) {
return request({
- url: baseApi + "/magic-api/pda/job/purchasereceipt/jobSubmit?id=" + id,
+ url: baseApi + "/wms/count-job-main/execute",
method: "put",
data: params,
});
@@ -1270,17 +1271,78 @@ export function unPlannedReceiptJobSubmit(params) {
}
/**
- * 计划外入库申请 提交
+ * 计划外入库申请 创建
* @param {*} params
*/
-export function unPlannedReceiptRequestbSubmit(params) {
+export function unPlannedReceiptRequestCreate(params) {
return request({
- url: baseApi + "/magic-api/pda/job/purchasereturn/jobSubmit",
- method: "put",
+ url: baseApi + "/wms/unplannedreceipt-request-main/create",
+ method: "post",
data: params,
});
}
+/**
+ * 计划外入库申请 提交审批
+ * @param {*} params
+ */
+export function unPlannedReceiptRequestApprove(id) {
+ return request({
+ url: baseApi + "/wms/unplannedreceipt-request-main/submit?id=" + id,
+ method: "put",
+ data: {},
+ });
+}
+
+/**
+ * 计划外入库申请 关闭
+ * @param {*} params
+ */
+export function unPlannedReceiptRequestClose(id) {
+ return request({
+ url: baseApi + "/wms/unplannedreceipt-request-main/close?id=" + id,
+ method: "put",
+ data: {},
+ });
+}
+
+/**
+ * 计划外入库申请 审批通过
+ * @param {*} params
+ */
+export function unPlannedReceiptRequestApproveAgree(id) {
+ return request({
+ url: baseApi + "/wms/unplannedreceipt-request-main/agree?id=" + id,
+ method: "put",
+ data: {},
+ });
+}
+
+/**
+ * 计划外入库申请 审批驳回
+ * @param {*} params
+ */
+export function unPlannedReceiptRequestApproveRefused(id) {
+ return request({
+ url: baseApi + "/wms/unplannedreceipt-request-main/refused?id=" + id,
+ method: "put",
+ data: {},
+ });
+}
+
+/**
+ * 计划外入库申请 处理
+ * @param {*} params
+ */
+export function unPlannedReceiptRequestHandle(id) {
+ return request({
+ url: baseApi + "/wms/unplannedreceipt-request-main/handle?id=" + id,
+ method: "put",
+ data: {},
+ });
+}
+
+
/**
* 计划外入库记录 提交
* @param {*} params
@@ -1365,7 +1427,7 @@ export function unPlannedIssueJobSubmit(params) {
* 计划外出库申请 提交
* @param {*} params
*/
-export function unPlannedIssueRequestSubmit(params) {
+export function unPlannedIssueRequestCreate(params) {
return request({
url: baseApi + "/wms/unplannedissue-request-main/create",
method: "post",
@@ -1373,6 +1435,67 @@ export function unPlannedIssueRequestSubmit(params) {
});
}
+/**
+ * 计划外出库申请 提交审批
+ * @param {*} params
+ */
+export function unPlannedIssueRequestApprove(id) {
+ return request({
+ url: baseApi + "/wms/unplannedissue-request-main/submit?id=" + id,
+ method: "put",
+ data: {},
+ });
+}
+
+/**
+ * 计划外出库申请 关闭
+ * @param {*} params
+ */
+export function unPlannedIssueRequestClose(id) {
+ return request({
+ url: baseApi + "/wms/unplannedissue-request-main/close?id=" + id,
+ method: "put",
+ data: {},
+ });
+}
+
+/**
+ * 计划外出库申请 审批通过
+ * @param {*} params
+ */
+export function unPlannedIssueRequestApproveAgree(id) {
+ return request({
+ url: baseApi + "/wms/unplannedissue-request-main/agree?id=" + id,
+ method: "put",
+ data: {},
+ });
+}
+
+/**
+ * 计划外出库申请 审批驳回
+ * @param {*} params
+ */
+export function unPlannedIssueRequestApproveRefused(id) {
+ return request({
+ url: baseApi + "/wms/unplannedissue-request-main/refused?id=" + id,
+ method: "put",
+ data: {},
+ });
+}
+
+/**
+ * 计划外出库申请 处理
+ * @param {*} params
+ */
+export function unPlannedIssueRequestHandle(id) {
+ return request({
+ url: baseApi + "/wms/unplannedissue-request-main/handle?id=" + id,
+ method: "put",
+ data: {},
+ });
+}
+
+
/**
* 计划外出库记录 提交
* @param {*} params
@@ -1415,26 +1538,26 @@ export function getProductReceiptJobDetail(id) {
}
/**
- * 制品收货 承接
+ * 制品收货任务 承接
* @param {*} id
*
*/
export function takeProductReceiptJob(id) {
return request({
- url: baseApi + "/wms/purchasereceipt-job-main/abandon?id=" + id,
+ url: baseApi + "/wms/productreceipt-job-main/accept?id=" + id,
method: "put",
data: {},
});
}
/**
- * 制品收货 放弃承接
+ * 制品收货任务 放弃承接
* @param {*} id
*
*/
export function cancleTakeProductReceiptJob(id) {
return request({
- url: baseApi + "/wms/purchasereceipt-job-main/abandon?id=" + id,
+ url: baseApi + "/wms/productreceipt-job-main/abandon?id=" + id,
method: "put",
data: {},
});
@@ -1446,7 +1569,7 @@ export function cancleTakeProductReceiptJob(id) {
*/
export function productReceiptJobsubmit(params) {
return request({
- url: baseApi + "/magic-api/pda/job/purchasereturn/jobSubmit",
+ url: baseApi + "/wms/productreceipt-job-main/execute",
method: "put",
data: params,
});
@@ -2129,7 +2252,7 @@ export function issueRequestSubmit(params) {
*/
export function issueRequestHandle(id) {
return request({
- url: baseApi + "/wms/issue-request-main/handle?id="+id,
+ url: baseApi + "/wms/issue-request-main/handle?id=" + id,
method: "put",
data: {},
});
@@ -2142,7 +2265,7 @@ export function issueRequestHandle(id) {
*/
export function issueRequestSubmitApprove(id) {
return request({
- url: baseApi + "/wms/issue-request-main/submit?id="+id,
+ url: baseApi + "/wms/issue-request-main/submit?id=" + id,
method: "put",
data: {},
});
@@ -2154,7 +2277,7 @@ export function issueRequestSubmitApprove(id) {
*/
export function issueRequestSubmitApproveAgree(id) {
return request({
- url: baseApi + "/wms/issue-request-main/agree?id="+id,
+ url: baseApi + "/wms/issue-request-main/agree?id=" + id,
method: "put",
data: {},
});
@@ -2166,7 +2289,7 @@ export function issueRequestSubmitApproveAgree(id) {
*/
export function issueRequestSubmitApproveRefused(id) {
return request({
- url: baseApi + "/wms/issue-request-main/refused?id="+id,
+ url: baseApi + "/wms/issue-request-main/refused?id=" + id,
method: "put",
data: {},
});
@@ -2178,7 +2301,7 @@ export function issueRequestSubmitApproveRefused(id) {
*/
export function issueRequestClose(id) {
return request({
- url: baseApi + "/wms/issue-request-main/close?id="+id,
+ url: baseApi + "/wms/issue-request-main/close?id=" + id,
method: "put",
data: {},
});
@@ -2465,7 +2588,7 @@ export function unPlannedReceiptRequestSubmit(params) {
/**
- * 报废出库 任务
+ * 报废出库任务
* status 任务状态
* 开始日期
* 结束日期
@@ -2498,7 +2621,7 @@ export function getScrapJobDetail(id) {
*/
export function takeScrapJob(id) {
return request({
- url: baseApi + "/wms/purchasereceipt-job-main/accept?id=" + id,
+ url: baseApi + "/wms/scrap-job-main/accept?id=" + id,
method: "put",
data: {},
});
@@ -2511,7 +2634,7 @@ export function takeScrapJob(id) {
*/
export function cancleTakeScrapJob(id) {
return request({
- url: baseApi + "/wms/purchasereceipt-job-main/abandon?id=" + id,
+ url: baseApi + "/wms/scrap-job-main/abandon?id=" + id,
method: "put",
data: {},
});
@@ -2524,7 +2647,7 @@ export function cancleTakeScrapJob(id) {
*/
export function scrapJobSubmit(params) {
return request({
- url: baseApi + "/magic-api/pda/job/purchasereceipt/jobSubmit?id=" + id,
+ url: baseApi + "/wms/scrap-job-main/execute",
method: "put",
data: params,
});
@@ -2560,17 +2683,77 @@ export function getScrapRequestDetail(id) {
}
/**
- * 报废出库申请 提交
+ * 报废出库申请 创建
* @param {*} params
*/
-export function scrapRequestSubmit(params) {
+export function scrapRequestCreate(params) {
return request({
- url: baseApi + "/wms/purchasereturn-request-main/submit",
- method: "put",
+ url: baseApi + "/wms/scrap-request-main/create",
+ method: "post",
data: params,
});
}
+/**
+ * 报废出库申请 提交审批
+ * @param {*} params
+ */
+export function scrapRequestApprove(id) {
+ return request({
+ url: baseApi + "/wms/scrap-request-main/submit?id=" + id,
+ method: "put",
+ data: {},
+ });
+}
+
+/**
+ * 报废出库申请 关闭
+ * @param {*} params
+ */
+export function scrapRequestClose(id) {
+ return request({
+ url: baseApi + "/wms/scrap-request-main/close?id=" + id,
+ method: "put",
+ data: {},
+ });
+}
+
+/**
+ * 报废出库申请 审批通过
+ * @param {*} params
+ */
+export function scrapRequestApproveAgree(id) {
+ return request({
+ url: baseApi + "/wms/scrap-request-main/agree?id=" + id,
+ method: "put",
+ data: {},
+ });
+}
+
+/**
+ * 报废出库申请 审批驳回
+ * @param {*} params
+ */
+export function scrapRequestApproveRefused(id) {
+ return request({
+ url: baseApi + "/wms/scrap-request-main/refused?id=" + id,
+ method: "put",
+ data: {},
+ });
+}
+
+/**
+ * 报废出库申请 审批驳回
+ * @param {*} params
+ */
+export function scrapRequestHandle(id) {
+ return request({
+ url: baseApi + "/wms/scrap-request-main/handle?id=" + id,
+ method: "put",
+ data: {},
+ });
+}
+
/**
* 报废出库记录 提交
* @param {*} params
@@ -2769,3 +2952,57 @@ export function getBalanceByFilter(param) {
data: param,
});
}
+
+
+/**
+ * 删除文件
+ * @param {*}
+ *
+ */
+export function deleteFileById(id) {
+ return request({
+ url: baseApi + "/infra/file/delete?id=" + id ,
+ method: "delete",
+ data: {},
+ });
+}
+
+
+/**
+ * 获取文件列表
+ * @param {*}
+ *
+ */
+export function getFileList(tableName, tableId) {
+ return request({
+ url: baseApi + "/infra/file/list?tableName=" + tableName + "&tableId=" + tableId,
+ method: "get",
+ data: {},
+ });
+}
+
+/**
+ * 图片上传
+ * @param {*}
+ *
+ */
+export function uploadFile(tableName, tableId,filePath,callBack) {
+ var token = storage.getStorage(storage.constant.token)
+ var url = getApp().globalData.request_url+baseApi
+ uni.uploadFile({
+ url: url+"/infra/file/upload?tableName="+tableName + "&tableId=" + tableId,
+ filePath: filePath,
+ name: 'file',
+ header: {
+ "Authorization": "Bearer " + token,
+ "tenant-id": 1
+ },
+ success: (uploadFileRes) => {
+ callBack(uploadFileRes.data)
+ console.log(uploadFileRes.data);
+ },
+ fail: (error) => {
+ callBack(undefined)
+ },
+ });
+}
diff --git a/common/basic.js b/common/basic.js
index b170962e..f3507b2a 100644
--- a/common/basic.js
+++ b/common/basic.js
@@ -715,6 +715,75 @@ export function getTodayDate() {
return startTime + "," + endTime;
}
+export function getCurrDateOneMonthsTimes() {
+ var end = Date.now()
+ // var end = new Date('2019/12/31 15:18').getTime()
+ var day = 31
+ var enda = new Date(end);
+ var endm = enda.getMonth() + 1;
+ var d = enda.getDate();
+ if (endm == 4 || endm == 6 || endm == 9 || endm == 11) {
+ day = 30
+ } else {
+ if (d == 31) {
+ day = 30
+ }
+ if (endm == 7 || endm == 12) {
+ day = 31
+ }
+ }
+ if (endm == 1) {
+ var endy = enda.getFullYear();
+ day = 31
+ if (d == 31) {
+ day = 28
+ }
+ if (d == 30) {
+ day = 29
+ }
+ if (d == 29) {
+ day = 30
+ }
+ if (endy % 4 == 0) {
+ day = 31
+ if (d == 31) {
+ day = 29
+ }
+ if (d == 30) {
+ day = 30
+ }
+ if (d == 29) {
+ day = 31
+ }
+ }
+ }
+ if (endm == 2) {
+ var endy = enda.getFullYear();
+ day = 28
+ if (endy % 4 == 0) {
+ day = 29
+ }
+ }
+ var start = 1000 * 60 * 60 * 24 * day
+ var interval = end + start;
+ return interval;
+}
+
+
+export function getCurrDateTimes() {
+ var time = (new Date()).getTime();
+ return time;
+}
+
+export function getBatch() {
+ var date = new Date();
+ var year = date.getFullYear(); //年
+ var month = date.getMonth() + 1; //月
+ var day = date.getDate(); //日
+ var batch =year.toString()+month.toString()+day.toString()
+ return batch;
+}
+
export function getCurrDate() {
var date = new Date();
return getDate(date);
@@ -733,11 +802,11 @@ export function getISODateTime() {
//格式化处理
export function dateFormat(time) {
var result = ""
- if(time!=null){
+ if (time != null) {
let date = new Date(time);
result = getDate(date) + " " + getTime(date);
}
-
+
return result;
}
diff --git a/common/directory.js b/common/directory.js
index 0ae9dfd8..8d76a32b 100644
--- a/common/directory.js
+++ b/common/directory.js
@@ -9,6 +9,7 @@ let containerTypeList = [];
let packUnitList = [];
let requestStatusList = [];
let unplannedReceiptReasonList = [];
+let unplannedIssueReasonList = [];
let unplannedIissueReason = [];
let scrapReasonList = [];
let inspectFailedReasonList = [];
@@ -16,6 +17,8 @@ let nextActionList = [];
let inspectTypeList = [];
let sampleMethodList = [];
let transferModeList = [];
+let countStageList = [];
+
// 获取业务类型字典项
@@ -42,6 +45,7 @@ export function clearCacheData() {
packUnitList = [];
requestStatusList = [];
unplannedReceiptReasonList = [];
+ unplannedIssueReasonList=[];
unplannedIissueReason = [];
scrapReasonList = [];
inspectFailedReasonList = [];
@@ -49,6 +53,7 @@ export function clearCacheData() {
inspectTypeList = [];
sampleMethodList =[];
transferModeList = [];
+ countStageList =[];
}
//获取字典信息
@@ -329,7 +334,7 @@ export function getUnPlannedReceiptReasonList(value) {
}
unplannedReceiptReasonList.forEach(res => {
res.text = res.label;
- res.value = res.code
+ res.value = res.value
})
return unplannedReceiptReasonList
}
@@ -341,7 +346,7 @@ export function getUnPlannedIssuseReasonList(value) {
}
unplannedIssueReasonList.forEach(res => {
res.text = res.label;
- res.value = res.code
+ res.value = res.value
})
return unplannedIssueReasonList
}
@@ -353,7 +358,7 @@ export function getScarpReasonList(value) {
}
scrapReasonList.forEach(res => {
res.text = res.label;
- res.value = res.code
+ res.value = res.value
})
return scrapReasonList
}
@@ -434,6 +439,26 @@ export function getTransferModeName(value) {
return resultInfo
}
+//获取盘点阶段名称
+export function getCountStageName(value) {
+ var resultInfo = "";
+ if (countStageList.length == 0) {
+ countStageList = getDirectoryInfo("count_stage")
+ }
+ if (countStageList.length > 0) {
+ for (let item of countStageList) {
+ if (item.value == value) {
+ resultInfo = item.label
+ break;
+ }
+ }
+ }
+ return resultInfo
+}
+
+
+
+
diff --git a/common/label.js b/common/label.js
index 60824ee0..b720c6a6 100644
--- a/common/label.js
+++ b/common/label.js
@@ -14,7 +14,7 @@ export function getLabelInfo(scanMsg, callBack) {
let items = scanMsg.split(';');
let header = items[0];
let version = items[1];
- if (header != '' && version != '') {
+ if ((header != undefined) && (version!=undefined)) {
//解析扫描的是一维码还是二维码
let type = header.substring(header.length - 1, header.length);
if (type == 'Q') //qrcode
@@ -26,6 +26,18 @@ export function getLabelInfo(scanMsg, callBack) {
} else { //直接输入文本
getBarCodeInfo('text', 'V1.0', scanMsg, callBack);
}
+ }else {
+ let labelResult = {
+ label: {
+ labelType: "",
+ barType: '',
+ code:""
+ },
+ package: null,
+ success: false,
+ message: '标签格式不正确',
+ }
+ callBack(labelResult);
}
}
@@ -38,12 +50,12 @@ export function getQRCodeInfo(header, version, scanMsg, callBack) {
barType: 'QRCode',
},
package: {},
- sucess: true,
+ success: true,
message: ''
}
getLabelByHeader(header, version).then(res => {
if (res.data==null) {
- labelResult.sucess = false;
+ labelResult.success = false;
labelResult.message = '未查找到标签头为[' + header + ']的标签类型';
callBack(labelResult);
} else {
@@ -57,7 +69,7 @@ export function getQRCodeInfo(header, version, scanMsg, callBack) {
getLabelItems(newItem, scanMsg, callBack);
}
}).catch(err => {
- labelResult.sucess = false;
+ labelResult.success = false;
labelResult.message = err;
callBack(err);
})
@@ -74,7 +86,7 @@ export function getLabelItems(labelItem, scanMsg, callBack) {
if (packingNumber != undefined) {
getPackageByNumber(packingNumber).then(pack => {
if (pack.data.list.length == 0) {
- labelResult.sucess = false;
+ labelResult.success = false;
labelResult.message = '包装号[' + packingNumber + ']没有包装信息';
} else {
labelResult.package = pack.data.list[0];
@@ -82,12 +94,12 @@ export function getLabelItems(labelItem, scanMsg, callBack) {
}
callBack(labelResult);
}).catch(err => {
- labelResult.sucess = false;
+ labelResult.success = false;
labelResult.message = err;
callBack(labelResult);
})
} else {
- labelResult.sucess = false;
+ labelResult.success = false;
labelResult.message = '在条码中未解析到箱码';
callBack(labelResult);
}
@@ -103,7 +115,7 @@ export function analysisQRCodeLabel(labelItem, scanMsg) {
barType: 'QRCode',
},
package: {},
- sucess: true,
+ success: true,
message: ''
}
@@ -112,7 +124,7 @@ export function analysisQRCodeLabel(labelItem, scanMsg) {
labelResult.message = "未读取到分隔符";
} else {
if (scanMsg.indexOf(separators) < 0) {
- labelResult.sucess = false;
+ labelResult.success = false;
labelResult.message = "标签格式不正确";
} else {
try {
@@ -153,7 +165,7 @@ export function getBarCodeInfo(header, version, value, callBack) {
code:value
},
package: null,
- sucess: true,
+ success: true,
message: '',
}
callBack(labelResult);
diff --git a/common/scan.js b/common/scan.js
index 93a3e8c5..73fe2759 100644
--- a/common/scan.js
+++ b/common/scan.js
@@ -13,12 +13,12 @@
//B:supplierBatch 供应商批次
//返回结果
-//sucess true:成功 false:失败
+//success true:成功 false:失败
//scanType barcode:条码 qrcode:二维码
//isPack true:箱码 false:托码
export function analyseScanInfo(scanMsg) {
let scanResult = {
- sucess: false,
+ success: false,
message: "",
data: {
isPack: null,
@@ -41,7 +41,7 @@ export function analyseScanInfo(scanMsg) {
console.log('1.扫描到的内容:', scanMsg);
//条码
if (scanMsg.indexOf(';') < 0) {
- scanResult.sucess = true;
+ scanResult.success = true;
scanResult.data.code = scanMsg;
scanResult.data.scanType = 'barcode'; //条码
} else {
@@ -107,15 +107,15 @@ export function analyseScanInfo(scanMsg) {
}
})
- scanResult.sucess = true;
+ scanResult.success = true;
} else { //扫描的是条码,直接返回接收到的内容
- scanResult.sucess = true;
+ scanResult.success = true;
scanResult.data.code = scanMsg;
scanResult.data.scanType = 'barcode';
}
}
} catch (ex) {
- scanResult.sucess = false;
+ scanResult.success = false;
scanResult.message = "解析遇到异常" + ex.message;
}
}
@@ -138,12 +138,12 @@ export function analyseScanInfo(scanMsg) {
//E:produceDate日期
//返回结果
-//sucess true:成功 false:失败
+//success true:成功 false:失败
//scanType barcode:条码 qrcode:二维码
//isPack true:箱码 false:托码
export function analyseProductLabelInfo(scanMsg) {
let scanResult = {
- sucess: false,
+ success: false,
message: "",
data: {
itemCode: null,
@@ -163,7 +163,7 @@ export function analyseProductLabelInfo(scanMsg) {
try {
//条码
if (scanMsg.indexOf(';') < 0) {
- scanResult.sucess = false;
+ scanResult.success = false;
scanResult.message = "标签格式不正确";
} else {
let arrayItems = scanMsg.split(';');
@@ -211,13 +211,13 @@ export function analyseProductLabelInfo(scanMsg) {
scanResult.data.produceDate = value;
break;
default:
- scanResult.sucess = false;
+ scanResult.success = false;
scanResult.message = "无法识别的前缀" + type;
break;
}
- scanResult.sucess = true;
+ scanResult.success = true;
} else {
- scanResult.sucess = false;
+ scanResult.success = false;
scanResult.message = "标签信息不能为空" + type;
}
}
@@ -225,12 +225,12 @@ export function analyseProductLabelInfo(scanMsg) {
} else { //扫描的是条码,直接返回接收到的内容
- scanResult.sucess = false;
+ scanResult.success = false;
scanResult.message = "标签分隔符错误";
}
}
} catch (ex) {
- scanResult.sucess = false;
+ scanResult.success = false;
scanResult.message = "解析遇到异常" + ex.message;
}
}
@@ -243,7 +243,7 @@ export function analyseProductLabelInfo(scanMsg) {
//1.序号1,2.生产号2546311FL,3.零件号254FL004,4.批序号202207110009
export function analyseTJMesQRCode(scanMsg) {
let scanResult = {
- sucess: false,
+ success: false,
message: "",
items: []
};
@@ -252,7 +252,7 @@ export function analyseTJMesQRCode(scanMsg) {
} else {
try {
if (scanMsg.indexOf(':') < 0) {
- scanResult.sucess = false;
+ scanResult.success = false;
scanResult.message = "标签格式不正确";
} else {
let arrayItems = scanMsg.split(':');
@@ -290,18 +290,18 @@ export function analyseTJMesQRCode(scanMsg) {
}
}
} else {
- scanResult.sucess = false;
+ scanResult.success = false;
scanResult.message = "标签信息不能为空";
}
})
- scanResult.sucess = true;
+ scanResult.success = true;
} else { //扫描的是条码,直接返回接收到的内容
- scanResult.sucess = false;
+ scanResult.success = false;
scanResult.message = "标签分隔符错误";
}
}
} catch (ex) {
- scanResult.sucess = false;
+ scanResult.success = false;
scanResult.message = "解析遇到异常" + ex.message;
}
}
diff --git a/mycomponents/detail/comRequestDetailCard.vue b/mycomponents/detail/comRequestDetailCard.vue
index 4be275d2..96110434 100644
--- a/mycomponents/detail/comRequestDetailCard.vue
+++ b/mycomponents/detail/comRequestDetailCard.vue
@@ -75,7 +75,6 @@
watch: {
dataContent(newVal) {
var test =this.dataContent
- debugger
this.requestItem = newVal.subList[0];
},
},
diff --git a/mycomponents/location/requiredLocation.vue b/mycomponents/location/requiredLocation.vue
index 7aa6746a..0ac2a93c 100644
--- a/mycomponents/location/requiredLocation.vue
+++ b/mycomponents/location/requiredLocation.vue
@@ -59,7 +59,10 @@
},
methods: {
showLocation() {
- this.$refs.scanLocationCode.openScanPopup();
+ if(this.isShowEdit){
+ this.$refs.scanLocationCode.openScanPopup();
+ }
+
},
//扫描源库位
getLocation(location, code) {
diff --git a/mycomponents/qty/CountQtyEdit.vue b/mycomponents/qty/CountQtyEdit.vue
index 0ded9f60..645ad726 100644
--- a/mycomponents/qty/CountQtyEdit.vue
+++ b/mycomponents/qty/CountQtyEdit.vue
@@ -43,7 +43,7 @@
-
+
库存数量 :
{{Number(dataContent.balanceQty)}}
@@ -52,7 +52,7 @@
+ style="align-items: center; padding-left: 30rpx;">
库存状态 :
{
- if (detail.record == undefined) {
- if (detail.packingNumber == this.dataContent.packingNumber &&
- detail.batch == this.dataContent.batch &&
- detail.inventoryStatus == this.inventoryStatus) {
- return detail;
- }
- } else {
- if (detail.record.packingNumber == this.dataContent.packingNumber &&
- detail.record.batch == this.dataContent.batch &&
- detail.record.inventoryStatus == this.inventoryStatus) {
- return detail;
- }
- }
-
- })
- if (item == undefined) {
- this.dataContent.inventoryStatus = this.inventoryStatus
- this.dataContent.qty = Number(this.allQty)
- this.$emit("confirm");
- this.closeEditPopup();
- } else {
- this.$refs.comMessage.showErrorMessage("箱码[" + item.packingNumber + "]批次[" + item.batch + "]" + "状态[" +
- getInventoryStatusName(item.inventoryStatus) + "]已经在列表中", res => {
- })
- }
- },
updateStatus(value) {
this.inventoryStatus = value
console.log(this.inventoryStatus)
diff --git a/mycomponents/qty/compareQty.vue b/mycomponents/qty/compareQty.vue
index 165ce424..1d4f7e8b 100644
--- a/mycomponents/qty/compareQty.vue
+++ b/mycomponents/qty/compareQty.vue
@@ -13,13 +13,15 @@
{{Number(handleQty)}}
+
- /
-
- {{Number(recommendQty)}}
-
+ /
+
+ {{Number(recommendQty)}}
+
+
-
+
@@ -71,6 +73,10 @@
isShowStdPack: {
type: Boolean,
default: true
+ },
+ isShowRecommendQty: {
+ type: Boolean,
+ default: true
}
},
watch: {
diff --git a/mycomponents/recommend/recommendCount.vue b/mycomponents/recommend/recommendCount.vue
new file mode 100644
index 00000000..14a1559d
--- /dev/null
+++ b/mycomponents/recommend/recommendCount.vue
@@ -0,0 +1,117 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 复制采购
+ |制品
+
+
+
+
+
+
+
+
+
diff --git a/mycomponents/scan/winComScan.vue b/mycomponents/scan/winComScan.vue
index 9616a0f8..573f2281 100644
--- a/mycomponents/scan/winComScan.vue
+++ b/mycomponents/scan/winComScan.vue
@@ -152,11 +152,12 @@
}
getLabelInfo(content, callback => {
let scanResult = callback;
- if (scanResult.sucess) {
+ if (scanResult.success) {
that.clear();
// that.getfocus();//不能自动获取焦点
that.$emit("getResult", scanResult);
} else {
+ that.clear();
this.$refs.comMessage.showErrorMessage(scanResult.message, res => {
if (res) {
that.getfocus();
diff --git a/mycomponents/scan/winScanPack.vue b/mycomponents/scan/winScanPack.vue
index 82058c80..7b8c9daf 100644
--- a/mycomponents/scan/winScanPack.vue
+++ b/mycomponents/scan/winScanPack.vue
@@ -74,7 +74,7 @@
},
getScanResult(result) {
- if (result.sucess) {
+ if (result.success) {
this.$emit("getResult", result);
} else {
this.showMessage(result.message)
diff --git a/pages.json b/pages.json
index e8d87a72..efd609d6 100644
--- a/pages.json
+++ b/pages.json
@@ -111,6 +111,13 @@
"enablePullDownRefresh": false
}
},
+ {
+ "path": "pages/purchaseReturn/request/returnRequestCreate",
+ "style": {
+ "navigationBarTitleText": "采购退货申请创建",
+ "enablePullDownRefresh": true
+ }
+ },
{
"path": "pages/purchaseReturn/job/returnJob",
@@ -149,6 +156,8 @@
// }
}
},
+
+
{
"path": "pages/purchaseReceipt/job/receiptJob",
"style": {
@@ -1640,6 +1649,14 @@
"enablePullDownRefresh": false
}
},
+ {
+ "path": "pages/scrap/request/scrapRequestCreate",
+ "style": {
+ "navigationBarTitleText": "报废出库申请创建",
+ "enablePullDownRefresh": false
+ }
+ },
+
{
"path": "pages/pallet/record/bindPalletRecord",
"style": {
diff --git a/pages/count/coms/comCountDetailCard.vue b/pages/count/coms/comCountDetailCard.vue
index 68b86d06..0cfd55ea 100644
--- a/pages/count/coms/comCountDetailCard.vue
+++ b/pages/count/coms/comCountDetailCard.vue
@@ -14,7 +14,7 @@
-
+
@@ -28,7 +28,7 @@
diff --git a/pages/count/coms/jobInfoPopup.vue b/pages/count/coms/jobInfoPopup.vue
index 1e244259..0d3996e4 100644
--- a/pages/count/coms/jobInfoPopup.vue
+++ b/pages/count/coms/jobInfoPopup.vue
@@ -6,12 +6,22 @@
计划单号 :
- {{dataContent.PlanNumber}}
+ {{dataContent.planNumber}}
阶段 :
- {{dataContent.Stage}}
+ {{getCountStageName(dataContent.stage)}}
+
+
+ 库位 :
+ {{dataContent.locationCode}}
+
+
+ 盘点策略 :
+ {{isOpenCount(dataContent.isOpenCount)}}
+
+
@@ -20,6 +30,9 @@
diff --git a/pages/count/job/countDetail.vue b/pages/count/job/countDetail.vue
index 7b38c44f..b5d9c19c 100644
--- a/pages/count/job/countDetail.vue
+++ b/pages/count/job/countDetail.vue
@@ -1,6 +1,27 @@
-
+
+
@@ -19,9 +40,6 @@
-
-
@@ -31,7 +49,8 @@
-
+
@@ -50,6 +69,9 @@
navigateBack,
getPackingNumberAndBatch
} from '@/common/basic.js';
+ import {
+ getCountStageName
+ } from '@/common/directory.js';
import winScanButton from '@/mycomponents/scan/winScanButton.vue'
import winScanPack from '@/mycomponents/scan/winScanPack.vue'
@@ -57,7 +79,8 @@
import comCountDetailCard from '@/pages/count/coms/comCountDetailCard.vue'
import comMessage from '@/mycomponents/common/comMessage.vue'
import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
- import CountQtyEdit from '@/mycomponents/qty/CountQtyEdit.vue'
+ import countQtyEdit from '@/mycomponents/qty/countQtyEdit.vue'
+ import jobTop from '@/mycomponents/job/jobTop.vue'
export default {
name: 'receipt_detail',
@@ -68,7 +91,8 @@
requiredLocation,
comMessage,
winScanPackAndLocation,
- CountQtyEdit,
+ countQtyEdit,
+ jobTop
},
data() {
return {
@@ -81,9 +105,6 @@
jobContent: {}, //任务内容
subList: [], //接口返回的任务subList
detailSource: [], //绑定在页面上的数据源
- locationTypeList: [],
- toLocationInfo: {},
- businessTypeInfo: {},
itemEditInfo: {}
};
},
@@ -91,15 +112,14 @@
this.id = option.id;
if (this.id != undefined) {
//新建的任务自动接收
- // if (option.status == "JOB_PENDING") {
- // this.receive((callback => {
- // this.received = true;
- // this.getDetail();
- // }));
- // } else {
- // this.getDetail();
- // }
- this.getDetail();
+ if (option.status == "1") {
+ this.receive((callback => {
+ this.received = true;
+ this.getDetail();
+ }));
+ } else {
+ this.getDetail();
+ }
}
},
//返回首页
@@ -158,14 +178,11 @@
if (res.data == null) {
that.showMessage('未获取到详情');
} else {
- if (res.data.subList.length > 0) {
- that.jobContent = res.data;
- that.fromLocationCode = that.jobContent.locationCode;
- that.subList = res.data.subList;
- that.detailSource = that.getDataSource(that.subList)
- } else {
- that.showErrorMessage('列表数据为0');
- }
+ that.jobContent = res.data;
+ that.fromLocationCode = that.jobContent.locationCode;
+ that.subList = res.data.subList;
+ that.detailSource = that.getDataSource(that.subList)
+ this.calcHandleQty();
}
}).catch(error => {
@@ -209,9 +226,8 @@
createDetailInfo(data) {
data.scaned = false;
- // data.record = {};
let detail = data;
- detail.balanceQty = detail.qty
+ detail.balanceQty = 0
detail.inventoryStatus = detail.inventoryStatus
detail.fromLocationCode = this.fromLocationCode
return detail;
@@ -233,12 +249,8 @@
for (let item of this.detailSource) {
item.handleQty = 0;
for (let detail of item.subList) {
- if (detail.scaned) {
- if (detail.record != undefined) {
- item.handleQty += Number(detail.record.qty)
- } else {
- item.handleQty += Number(detail.qty)
- }
+ if (detail != undefined && detail.scaned) {
+ item.handleQty += Number(detail.qty)
}
}
}
@@ -287,30 +299,19 @@
try {
var packingNumber = result.balance.packingNumber;
var batch = result.balance.batch;
- var qty = result.balance.qty;
+ var balanceQty = result.balance.qty;
var itemCode = result.balance.itemCode;
var inventoryStatus = result.balance.inventoryStatus;
var detail = this.detailSource.find(r => r.itemCode == itemCode);
+ var itemEditInfo;
//检查零件号是否存在
if (detail == undefined) {
//零件号不存在,创建零件号数据添加到列表。设置为已经扫描
this.addNewItemCodeToList(result)
} else {
//零件号存在,查询是否在任务列表中
- // var itemDetail;
- // var index;
-
- // for (var i = 0; i < detail.subList.length; i++) {
- // if (detail.subList[i].packingNumber == packingNumber &&
- // detail.subList[i].batch == batch &&
- // detail.subList[i].inventoryStatus == inventoryStatus) {
- // index = i;
- // itemDetail = detail.subList[i]
- // break
- // }
- // }
-
- this.itemEditInfo = detail.subList.find(item => {
+
+ itemEditInfo = detail.subList.find(item => {
if (item.packingNumber == packingNumber &&
item.batch == batch &&
item.inventoryStatus == inventoryStatus) {
@@ -318,19 +319,18 @@
}
})
- if (this.itemEditInfo == undefined) {
+ if (itemEditInfo == undefined) {
//不在任务列表中,提示是否添加到列表
this.addExistItemCodeToList(detail, result);
} else {
//在列表中,更新已扫描状态,
- if (this.itemEditInfo.scaned) {
+ if (itemEditInfo.scaned) {
this.$refs.comMessage.showSelectMessageModal("箱码【" + packingNumber +
"】已经完成盘点,是否要编辑数量",
res => {
- // this.$.refs["countDetail_" + index][0].edit(itemDetail)
if (res) {
- this.$refs.CountQtyEdit.openEditPopup(this.itemEditInfo.record,
+ this.$refs.countQtyEdit.openEditPopup(itemEditInfo,
detail.subList);
} else {
this.scanPopupGetFocus();
@@ -338,12 +338,12 @@
})
} else {
- // this.$.refs["countDetail_" + index][0].editSeconds(itemDetail)
- this.itemEditInfo.scaned = true;
- this.itemEditInfo.record = this.createRecordInfo(this.itemEditInfo);
- this.itemEditInfo.record.stdPackQty = result.package.stdPackQty;
- this.itemEditInfo.record.stdPackUnit = result.package.stdPackUnit;
- this.$refs.CountQtyEdit.openEditPopupShowSeconds(this.itemEditInfo.record, detail
+ itemEditInfo.scaned = true;
+ itemEditInfo.handleQty = balanceQty;
+ itemEditInfo.balanceQty = balanceQty;
+ itemEditInfo.stdPackQty = result.package.stdPackQty;
+ itemEditInfo.stdPackUnit = result.package.stdPackUnit;
+ this.$refs.countQtyEdit.openEditPopupShowSeconds(itemEditInfo, detail
.subList);
this.updateData()
}
@@ -361,7 +361,6 @@
if (res) {
var item = this.createAddItemInfo(result.balance, result.package);
let newDetail = this.createAddDetailInfo(result.balance, result.package); //
- newDetail.record = this.createRecordInfo(newDetail);
item.subList.push(newDetail);
this.detailSource.push(item)
this.updateData()
@@ -377,9 +376,7 @@
if (res) {
detail.qty += Number(detail.qty)
let newDetail = this.createAddDetailInfo(result.balance, result.package); //
- newDetail.record = this.createRecordInfo(newDetail);
detail.subList.push(newDetail);
- var test = this.detailSource;
this.updateData()
}
@@ -395,55 +392,43 @@
qty: Number(balance.qty),
handleQty: 0,
uom: pack.uom,
- subList: []
+ subList: [],
+
}
return item;
},
createAddDetailInfo(balance, pack) {
var detail = {
+ id: "0",
scaned: true,
- balanceQty: balance.qty,
- toInventoryStatus: balance.inventoryStatus,
- fromLocationCode: balance.locationCode,
- id: "",
countDetailNumber: "",
- ownerCode: balance.OwnerCode,
+ ownerCode: balance.ownerCode,
packingNumber: balance.packingNumber,
- containerNumber: pack.ContainerNumber,
+ containerNumber: pack.containerNumber,
batch: balance.batch,
inventoryStatus: balance.inventoryStatus,
- itemCode: balance.itemCode,
+ itemCode: pack.itemCode,
itemName: pack.itemName,
itemDesc1: pack.itemDesc1,
itemDesc2: pack.itemDesc2,
- stdPackQty: pack.stdPackQty,
- stdPackUnit: pack.stdPackUnit,
projectCode: "",
- qty: balance.qty,
+ qty: 0,
+ handleQty: balance.qty,
uom: balance.uom,
- masterID: "",
- number: "",
+ number: this.jobContent.number,
remark: "",
- creationTime: "",
- creatorId: "",
- creatorName: "",
- siteId: ""
+ countQty: balance.qty,
+ balanceQty: balance.qty,
+ fromLocationCode: balance.locationCode,
+ stdPackQty: pack.stdPackQty,
+ stdPackUnit: pack.stdPackUnit,
+ creator:this.$store.state.user.id
}
return detail;
},
- createRecordInfo(detail) {
- var record = {}
- detail.scaned = true;
- // let record = JSON.parse(JSON.stringify(detail));
- //克隆对象,深度克隆,防止双向绑定同一个变量
- Object.assign(record, detail)
- record.fromLocationCode = this.fromLocationCode;
- return record;
- },
-
scanLocationCode(location, code) {
this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
this.toLocationCode = code
@@ -456,19 +441,59 @@
},
+ getScanCount() {
+ var scanCount = 0;
+ this.detailSource.forEach(item => {
+ item.subList.forEach(detail => {
+ if (detail.scaned) {
+ scanCount = scanCount + 1;
+ }
+ })
+ })
+ return scanCount;
+ },
+
+ getTotalCount() {
+ var totalCount = 0;
+ this.detailSource.forEach(item => {
+ item.subList.forEach(detail => {
+ totalCount = totalCount + 1;
+ })
+ })
+ return totalCount;
+ },
+
+
commit() {
- if (this.scanCount == this.subList.length) {
+ this.scanCount = this.getScanCount();
+
+ if (this.scanCount == this.getTotalCount()) {
this.submitJob();
- } else if (this.scanCount < this.subList.length) {
+ } else if (this.scanCount < this.getTotalCount()) {
//扫描数量小于任务数量,判断是否允许部分提交
if (this.jobContent.allowPartialComplete == "TRUE") {
//提交
- this.submitJob();
+ this.$refs.comMessage.showQuestionMessage("已经扫描[" + this.scanCount +
+ "]总共[" + this
+ .getTotalCount() + "],是否把未扫描的盘点数量设置为0?",
+ res => {
+ if (res) {
+ this.detailSource.forEach(item => {
+ item.subList.forEach(detail => {
+ if (!detail.scaned) {
+ detail.countQty = 0;
+ }
+ })
+ })
+ this.submitJob();
+ }
+ });
+
} else {
//不允许部分提交,提示
this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交
' + "已经扫描[" + this.scanCount +
- "]箱总共[" + this
- .subList.length + "]箱", res => {
+ "]总共[" + this
+ .getTotalCount() + "]", res => {
if (res) {
this.openScanPopup();
}
@@ -477,59 +502,41 @@
}
},
-
- submitJob() {
+
+ submitJob() {
uni.showLoading({
title: "提交中....",
mask: true
});
- var itemCodes = []
- this.detailSource.forEach(item => {
- itemCodes.push(item.itemCode)
+ var params = this.setParams()
+ console.log("提交参数", JSON.stringify(params));
+ countJobSubmit(params).then(res => {
+ uni.hideLoading()
+ if (res.data) {
+ this.showCommitSuccessMessage("提交成功
生成盘点记录
" + res.data)
+ } else {
+ this.showErrorMessage("提交失败[" + res.msg + "]")
+ }
+ }).catch(error => {
+ uni.hideLoading()
+ this.showErrorMessage(error)
})
-
- //获取管理模式,封装参数
- // getManagementPrecisions(itemCodes, this.toLocationCode, res => {
- // if (res.success) {
- // this.managementList = res.list;
- // var params = this.setParams()
- // console.log("提交参数", JSON.stringify(params));
- // // var params = this.getParams();
-
- // // countJobSubmit(this.id, params).then(res => {
- // // if (res.data) {
- // // this.showCommitSuccessMessage("提交成功
生成采购收货记录" + res.data.Number, )
- // // } else {
- // // this.showErrorMessage("提交失败[" + res.msg + "]")
- // // }
- // // uni.hideLoading()
- // // }).catch(error => {
- // // uni.hideLoading()
- // // this.showErrorMessage(error)
- // // })
- // } else {
- // uni.hideLoading();
- // this.showErrorMessage(res.message);
- // }
- // });
-
+
},
-
+
setParams() {
var subList = []
var creator = this.$store.state.user.id
-
+
this.detailSource.forEach(item => {
item.subList.forEach(detail => {
if (detail.scaned) {
- var info = getPackingNumberAndBatch(this.managementList, detail.itemCode,
- detail.packingNumber, detail.batch);
- detail.toPackingNumber = info.packingNumber;
- detail.toBatch = info.batch;
- subList.push(detail)
+ detail.countQty = detail.handleQty;
}
+ subList.push(detail)
})
})
+
this.jobContent.subList = subList
this.jobContent.creator = creator;
return this.jobContent;
@@ -564,8 +571,8 @@
},
editItem(item) {
- var detail = this.detailSource.find(r => r.itemCode == item.record.itemCode);
- this.$refs.CountQtyEdit.openEditPopup(item.record,
+ var detail = this.detailSource.find(r => r.itemCode == item.itemCode);
+ this.$refs.countQtyEdit.openEditPopup(item,
detail.subList);
},
@@ -573,7 +580,14 @@
this.$refs.comMessage.showSuccessMessage(hint, res => {
navigateBack(1);
})
+ },
+ getCountStageName(value) {
+ return getCountStageName(value)
+ },
+ isOpenCount(value) {
+ return value == "TRUE" ? "明盘" : "盲盘"
}
+
}
}
diff --git a/pages/deliver/request/deliverRequestCreate.vue b/pages/deliver/request/deliverRequestCreate.vue
index 76134316..fb2d7209 100644
--- a/pages/deliver/request/deliverRequestCreate.vue
+++ b/pages/deliver/request/deliverRequestCreate.vue
@@ -64,7 +64,7 @@
detailOptions: [],
scanOptions: [],
fromType: "",
- dataContent:{}
+ dataContent: {}
}
},
@@ -167,39 +167,38 @@
},
-
- setRequestParams(){
+
+ setRequestParams() {
var subList = []
this.detailSource.subList.forEach(detail => {
- debugger
- detail.soNumber = detail.package.soNumber;
- detail.soLine = detail.package.soLine;
- detail.remark =""
- // soNumber: 926926926,
- // soLine: 926,
- // itemCode: THILDD0A691AG,
- // remark: ,
- // qty: 2,
- // uom: EA
- subList.push(detail)
+ detail.soNumber = detail.package.soNumber;
+ detail.soLine = detail.package.soLine;
+ detail.remark = ""
+ // soNumber: 926926926,
+ // soLine: 926,
+ // itemCode: THILDD0A691AG,
+ // remark: ,
+ // qty: 2,
+ // uom: EA
+ subList.push(detail)
})
-
- this.detailSource.subList = subList
- this.detailSource.deliverPlanNumber = "DP20231130-0001"
- this.detailSource.customerCode = this.detailSource.customerCode
- this.detailSource.customerDockCode = ""
- this.detailSource.carrierCode = ""
- this.detailSource.transferMode = ""
- this.detailSource.vehiclePlateNumber = ""
- this.detailSource.remark = ""
- this.detailSource.dueTime = ""
- this.detailSource.departmentCode = "研发部门"
- this.detailSource.status = 1
- this.detailSource.autoCommit = "FALSE"
- this.detailSource.autoAgree = "FALSE"
- this.detailSource.autoExecute = "FALSE"
- this.detailSource.directCreateRecord = "FALSE"
-
+
+ this.detailSource.subList = subList
+ this.detailSource.deliverPlanNumber = "DP20231130-0001"
+ this.detailSource.customerCode = this.detailSource.customerCode
+ this.detailSource.customerDockCode = ""
+ this.detailSource.carrierCode = ""
+ this.detailSource.transferMode = ""
+ this.detailSource.vehiclePlateNumber = ""
+ this.detailSource.remark = ""
+ this.detailSource.dueTime = ""
+ this.detailSource.departmentCode = "研发部门"
+ this.detailSource.status = 1
+ this.detailSource.autoCommit = "FALSE"
+ this.detailSource.autoAgree = "FALSE"
+ this.detailSource.autoExecute = "FALSE"
+ this.detailSource.directCreateRecord = "FALSE"
+
return this.detailSource;
},
showCommitSuccessMessage(hint) {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 1cf7c69c..1dddb782 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -272,7 +272,7 @@
types:["job_status","location_type","item_status","uom",
"inventory_status","container_type","pack_unit","unplanned_receipt_reason",
"unplanned_issue_reason","scrap_reason","inspect_failed_reason",
- "request_status","inspect_type","next_action","sample_method","transfer_mode"]
+ "request_status","inspect_type","next_action","sample_method","transfer_mode","count_stage"]
}
getDictionaryItem(params).then(res => {
if (res.data.length > 0) {
diff --git a/pages/inspect/coms/inspectEdit.vue b/pages/inspect/coms/inspectEdit.vue
index 53a4a918..4cefd83e 100644
--- a/pages/inspect/coms/inspectEdit.vue
+++ b/pages/inspect/coms/inspectEdit.vue
@@ -1,6 +1,6 @@
-
+
箱码
@@ -49,8 +49,8 @@
-
-
+
@@ -65,6 +65,12 @@
import {
getInspectFailedReasonList,
} from '@/common/directory.js';
+ import {
+ uploadFile,
+ getFileList,
+ deleteFileById
+ } from '@/api/request2.js';
+
import comMessage from '@/mycomponents/common/comMessage.vue'
import uploadCamera from '@/pages/inspect/coms/uploadCamera.vue'
import uom from '@/mycomponents/qty/uom.vue'
@@ -81,7 +87,8 @@
failedReasonIndex: 0,
failedReasonArray: [],
dataContent: {},
- failedReasonArray: []
+ failedReasonArray: [],
+ picInfoList: []
}
},
props: {
@@ -101,11 +108,93 @@
this.failedReasonArray = getInspectFailedReasonList();
//拷贝数据到页面显示,防止修改数据原数据修改
this.dataContent = Object.assign({}, item)
+ this.getFileList();
this.$refs['editPopup'].open("bottom");
+
+
+ },
+ getFileList() {
+ getFileList("jobInspectDetail", this.dataContent.id).then(res => {
+ if(res.data){
+ var imageFiles = [];
+ res.data.forEach(item=>{
+ var image = this.createImage(item.id, item.url, item.path, item.size)
+ imageFiles.push(image)
+ })
+ }
+
+ if (imageFiles.length > 0) {
+ this.$nextTick(function() {
+ this.$refs.uploadImage.setFiles(imageFiles);
+ this.setPhotosInfo();
+ })
+
+ }
+ })
+ },
+
+ setPhotosInfo(){
+ var list = this.$refs.uploadImage.getFiles()
+ var photoItem = "";
+ for (var i = 0; i < list.length; i++) {
+ if (list.length - 1 == i) {
+ photoItem = photoItem + list[i].url
+ } else {
+ photoItem = photoItem + list[i].url + ","
+ }
+ }
+ this.dataContent.photos = photoItem;
+ },
+
+
+ createImage(id, url, fileName, size) {
+
+ let image = {
+ id: id,
+ name: fileName,
+ extname: "png",
+ fileType: "image",
+ url: url,
+ size: size,
+ image: {
+ width: 175,
+ height: 175,
+ location: url,
+ },
+ path: url,
+ progress: 100,
+ status: "ready"
+ }
+
+ return image;
+ },
+
+ deleteImg(content) {
+ var id = content.id
+ if (id != undefined) {
+ deleteFileById(id).then(res => {
+ if (res.data) {
+ uni.showToast({
+ title: "删除成功"
+ })
+ }
+ }).catch(error => {
+ console.log(error)
+ })
+ } else {
+ this.getFileList();
+ }
+
+ },
+ select(content) {
+ this.uploadFile(content);
},
back() {
- this.$refs['editPopup'].close();
+ this.afterSave()
+ },
+ maskClick() {
+
},
afterSave() {
@@ -119,6 +208,8 @@
}
});
},
+
+
save() {
var failedQty = Number(this.dataContent.failedQty);
var crackQty = Number(this.dataContent.crackQty);
@@ -137,13 +228,26 @@
}
this.dataContent.failedQty = failedQty;
this.dataContent.crackQty = crackQty
- this.dataContent.goodQty = this.dataContent.handleQty -failedQty-crackQty
+ this.dataContent.goodQty = this.dataContent.handleQty - failedQty - crackQty
this.afterSave()
+ },
+ uploadFile(content) {
+ uploadFile("jobInspectDetail", this.dataContent.id, content.path, res => {
+ if (res != undefined) {
+ uni.showToast({
+ title: "上传成功"
+ })
+ } else {
+ uni.showToast({
+ title: "上传失败"
+ })
+ }
+ this.getFileList();
+ })
}
-
}
}
diff --git a/pages/inspect/coms/uploadCamera.vue b/pages/inspect/coms/uploadCamera.vue
index b1f0857f..13718fdc 100644
--- a/pages/inspect/coms/uploadCamera.vue
+++ b/pages/inspect/coms/uploadCamera.vue
@@ -33,12 +33,14 @@
},
// 获取上传状态
select(e) {
- console.log('选择文件:', e)
+ // console.log('选择文件:', e)
+ this.$emit("select",e.tempFiles[0])
},
//删除
deleteImg(e) {
- console.log('删除:', e)
+ // console.log('删除:', e)
+ this.$emit("delete",e.tempFile)
},
// 获取上传进度
diff --git a/pages/inspect/job/inspectDetail.vue b/pages/inspect/job/inspectDetail.vue
index 89df9ba5..9c77da89 100644
--- a/pages/inspect/job/inspectDetail.vue
+++ b/pages/inspect/job/inspectDetail.vue
@@ -39,8 +39,9 @@
takeInspectJob,
cancleTakeInspectJob,
getInspectJobDetail,
- getBasicLocationByCode,
- inspectJobSubmit
+ inspectJobSubmit,
+ deleteFileById,
+ getFileList
} from '@/api/request2.js';
import {
goHome,
@@ -135,6 +136,7 @@
}
},
+
onPullDownRefresh() {
this.getDetail();
@@ -145,6 +147,29 @@
},
methods: {
+ deleteFileById(id){
+ deleteFileById(id).then(res=>{
+
+ })
+
+ },
+ getFileList(id){
+ getFileList("jobInspectDetail", id).then(res => {
+ if(res.data){
+ res.data.forEach(res=>{
+ this.deleteFileById(res.id)
+ })
+ }
+ })
+ },
+
+ clearPicList(subList){
+ subList.forEach(item=>{
+ this.getFileList(item.id)
+ })
+ },
+
+
//接收
receive(callback) {
uni.showLoading({
@@ -179,6 +204,7 @@
that.jobContent.failedQty = this.failedQty
that.jobContent.crackQty = this.crackQty;
that.subList = res.data.subList;
+ this.clearPicList(that.subList);
that.subList.forEach(res => {
res.batch = that.jobContent.batch
res.goodQty = 0;
diff --git a/pages/inspect/job/inspectFullDetail.vue b/pages/inspect/job/inspectFullDetail.vue
index bdab4d99..539eb678 100644
--- a/pages/inspect/job/inspectFullDetail.vue
+++ b/pages/inspect/job/inspectFullDetail.vue
@@ -39,8 +39,9 @@
takeInspectJob,
cancleTakeInspectJob,
getInspectJobDetail,
- getBasicLocationByCode,
- inspectJobSubmit
+ inspectJobSubmit,
+ deleteFileById,
+ getFileList
} from '@/api/request2.js';
import {
goHome,
@@ -147,6 +148,27 @@
},
methods: {
+ deleteFileById(id){
+ deleteFileById(id).then(res=>{
+
+ })
+
+ },
+ getFileList(id){
+ getFileList("jobInspectDetail", id).then(res => {
+ if(res.data){
+ res.data.forEach(res=>{
+ this.deleteFileById(res.id)
+ })
+ }
+ })
+ },
+
+ clearPicList(subList){
+ subList.forEach(item=>{
+ this.getFileList(item.id)
+ })
+ },
//接收
receive(callback) {
uni.showLoading({
@@ -182,6 +204,7 @@
this.jobContent.crackQty = 0;
this.jobContent.notPassedQty = 0;
that.subList = res.data.subList;
+ this.clearPicList(that.subList);
that.subList.forEach(res => {
res.batch = that.jobContent.batch
res.goodQty = 0;
@@ -330,23 +353,23 @@
commit() {
this.scanCount = getScanCount(this.subList);
- if (this.scanCount == 0) {
- this.showErrorMessage("扫描数为0,请先扫描")
- return;
+ // if (this.scanCount == 0) {
+ // this.showErrorMessage("扫描数为0,请先扫描")
+ // return;
+ // }
+ //如果是全检,必须全部扫描-------改为:任务中的是否允许部分提交:nxt 2023年12月13日
+ if (this.jobContent.allowPartialComplete == "TRUE") {
+ this.submitJob();
+ } else {
+ //不允许部分提交,提示
+ this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交
' + "已经扫描[" + this.scanCount +
+ "]箱总共[" + this
+ .subList.length + "]箱", res => {
+ if (res) {
+ this.openScanPopup();
+ }
+ });
}
- //如果是全检,必须全部扫描
- if (this.scanCount == this.subList.length) {
- this.submitJob();
- } else {
- //不允许部分提交,提示
- this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交
' + "已经扫描[" + this.scanCount +
- "]箱总共[" + this
- .subList.length + "]箱", res => {
- if (res) {
- this.openScanPopup();
- }
- });
- }
},
submitJob() {
@@ -455,7 +478,7 @@
list.push(detail)
})
})
- this.jobContent.notPassedQty = Number(this.jobContent.failedQty)+ Number(this.jobContent.crackQty)
+ this.jobContent.notPassedQty = Number(this.jobContent.failedQty) + Number(this.jobContent.crackQty)
this.jobContent.subList = list
this.jobContent.nextAction = "PARTIAL_OK";
return this.jobContent;
diff --git a/pages/issue/coms/comIssueDetailCard.vue b/pages/issue/coms/comIssueDetailCard.vue
index f03fc0a7..e8a8505f 100644
--- a/pages/issue/coms/comIssueDetailCard.vue
+++ b/pages/issue/coms/comIssueDetailCard.vue
@@ -8,8 +8,9 @@
+
-
@@ -21,8 +22,8 @@
-
+
@@ -140,7 +141,7 @@
let that = this;
that.editItem = item;
that.batchItem = batch;
- item.balance.balanceQty=item.balance.qty;
+ item.balance.balanceQty = item.balance.qty;
that.$refs.balanceQtyEdit.openEditPopup(item.balance, item.qty);
},
diff --git a/pages/issue/coms/comIssueRequestCreator.vue b/pages/issue/coms/comIssueRequestCreator.vue
index 7a4cd165..a5276da9 100644
--- a/pages/issue/coms/comIssueRequestCreator.vue
+++ b/pages/issue/coms/comIssueRequestCreator.vue
@@ -71,9 +71,13 @@
},
},
watch: {
- dataContent(newVal) {
- this.requestItem = newVal.subList[0];
- },
+ dataContent: {
+ handler(newval, oldval) {
+ this.requestItem = this.dataContent.subList[0];
+ },
+ immediate: true,
+ deep: true
+ }
},
data() {
diff --git a/pages/issue/job/issueDetail.vue b/pages/issue/job/issueDetail.vue
index 963a3af5..5860906e 100644
--- a/pages/issue/job/issueDetail.vue
+++ b/pages/issue/job/issueDetail.vue
@@ -13,7 +13,7 @@
-
+
@@ -140,7 +140,6 @@
methods: {
resizeCollapse() {
this.$nextTick(r => {
- // debugger;
this.$refs.comIssueDetailCard.forEach(r => {
r.resizeCollapse();
})
@@ -291,6 +290,13 @@
batch.Records.forEach(r => {
let record = {};
record.handleQty = r.qty;
+
+ record.fromPackingNumber = r
+ .packingNumber;
+ record.fromBatch = r.batch;
+ record.fromContainerNumber = r
+ .ContainerNumber;
+
record.toContainerNumber = r
.ContainerNumber;
record.toInventoryStatus = r
diff --git a/pages/issue/request/issueRequest.vue b/pages/issue/request/issueRequest.vue
index d562b237..c09f2418 100644
--- a/pages/issue/request/issueRequest.vue
+++ b/pages/issue/request/issueRequest.vue
@@ -373,18 +373,10 @@
},
requestConfirmsss(action, item) {
- debugger;
uni.navigateTo({
url: './issueRequestDetail?type=add&item=' + item.id
});
}
-
- // requestConfirm(action, item) {
- // debugger;
- // uni.navigateTo({
- // url: './issueRequestDetail?type=add&item=' + item.id
- // });
- // }
}
diff --git a/pages/issue/request/issueRequestCreate.vue b/pages/issue/request/issueRequestCreate.vue
index b547a751..e222eee4 100644
--- a/pages/issue/request/issueRequestCreate.vue
+++ b/pages/issue/request/issueRequestCreate.vue
@@ -36,7 +36,7 @@
goHome,
updateTitle,
getRemoveOption,
- getISODateTime
+ getCurrDateOneMonthsTimes
} from '@/common/basic.js';
import {
@@ -150,6 +150,7 @@
setParams() {
+ this.detailSource.dueTime = getCurrDateOneMonthsTimes();
return this.detailSource
},
submit() {
diff --git a/pages/package/record/mergePackageRecord.vue b/pages/package/record/mergePackageRecord.vue
index 2d57c1dd..b7f4e1ce 100644
--- a/pages/package/record/mergePackageRecord.vue
+++ b/pages/package/record/mergePackageRecord.vue
@@ -44,10 +44,13 @@
+
+
diff --git a/pages/productReceipt/job/productReceiptDetail.vue b/pages/productReceipt/job/productReceiptDetail.vue
index 6c67be4f..1425e40d 100644
--- a/pages/productReceipt/job/productReceiptDetail.vue
+++ b/pages/productReceipt/job/productReceiptDetail.vue
@@ -13,10 +13,10 @@
-
-
+
@@ -37,8 +37,7 @@
-
-
+
@@ -56,7 +55,6 @@
} from '@/api/request2.js';
import {
goHome,
- getCurrDateTime,
navigateBack,
getPackingNumberAndBatch,
} from '@/common/basic.js';
@@ -79,8 +77,9 @@
import comMessage from '@/mycomponents/common/comMessage.vue'
import winScanPack from "@/mycomponents/scan/winScanPack.vue"
import comDetailCard from "@/mycomponents/detail/comDetailCard.vue"
- import detailInfoPopup from '@/pages/productReceipt/coms/detailInfoPopup.vue'
import jobTop from '@/mycomponents/job/jobTop.vue'
+ import comProductDetailCard from "@/pages/productReceipt/coms/comProductDetailCard.vue"
+
export default {
name: 'receipt_detail',
@@ -90,8 +89,8 @@
requiredLocation,
winScanPack,
comMessage,
- detailInfoPopup,
- jobTop
+ jobTop,
+ comProductDetailCard
},
data() {
return {
@@ -104,10 +103,8 @@
jobContent: {}, //任务内容
subList: [], //接口返回的任务subList
detailSource: [], //绑定在页面上的数据源
- fromLocationTypeList: [],
toLocationTypeList: [],
toLocationInfo: {},
- businessTypeInfo: {},
managementList: []
};
@@ -116,16 +113,15 @@
this.id = option.id;
if (this.id != undefined) {
//新建的任务自动接收
- // if (option.status == "JOB_PENDING") {
- // this.receive((callback => {
- // this.received = true;
- // this.getDetail();
- // }));
- // } else {
- // this.getDetail();
- // }
-
- this.getDetail();
+ if (option.status == "1") {
+ this.receive((callback => {
+ this.received = true;
+ this.getDetail();
+ }));
+ } else {
+ this.getDetail();
+ }
+
}
},
//返回首页
@@ -189,7 +185,6 @@
that.jobContent = res.data;
that.subList = res.data.subList;
that.toLocationCode = that.subList[0].toLocationCode
- that.fromLocationTypeList = getDirectoryItemArray(that.jobContent.fromLocationTypes);
that.toLocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes)
that.detailSource = getDataSource(that.subList)
} else {
@@ -226,19 +221,15 @@
itemDetail.handleQty = Number(result.label.qty);
itemDetail.toLocationCode = this.toLocationCode;
itemDetail.labelQty = Number(result.label.qty);
- this.calcHandleQty();
+ calcHandleQty(this.detailSource);
+ this.continueScan()
+ this.$forceUpdate()
}
}
}
},
- calcHandleQty() {
- calcHandleQty(this.detailSource)
- this.continueScan();
- this.$forceUpdate();
- },
-
//继续扫描
continueScan() {
this.scanCount = getScanCount(this.subList);
@@ -251,12 +242,9 @@
updateData() {
- this.calcHandleQty();
+ calcHandleQty(this.detailSource);
},
- openDetail(item) {
- this.$refs.detailInfoPopup.openPopup(item)
- },
openScanPopup() {
this.$refs.scanPopup.openScanPopup();
@@ -342,17 +330,17 @@
this.managementList = res.list;
var params = this.setParams();
console.log("提交参数",JSON.stringify(params));
- // productReceiptJobsubmit(params).then(res => {
- // uni.hideLoading()
- // if (res.data) {
- // this.showCommitSuccessMessage("提交成功
生成制品收货记录" + res.data, )
- // } else {
- // this.showErrorMessage("提交失败[" + res.msg + "]")
- // }
- // }).catch(error => {
- // uni.hideLoading()
- // this.showErrorMessage(error)
- // })
+ productReceiptJobsubmit(params).then(res => {
+ uni.hideLoading()
+ if (res.data) {
+ this.showCommitSuccessMessage("提交成功
生成制品收货记录
" + res.data, )
+ } else {
+ this.showErrorMessage("提交失败[" + res.msg + "]")
+ }
+ }).catch(error => {
+ uni.hideLoading()
+ this.showErrorMessage(error)
+ })
} else {
uni.hideLoading();
this.showErrorMessage(res.message);
@@ -369,8 +357,11 @@
if (detail.scaned) {
var info = getPackingNumberAndBatch(this.managementList, detail.itemCode,
detail.packingNumber, detail.batch);
- detail.toPackingNumber =info.packingNumber;
- detail.toBatch =info.batch;
+ detail.toPackingNumber = info.packingNumber;
+ detail.toBatch = info.batch;
+ detail.toContainerNumber = '';
+ detail.toInventoryStatus =detail.inventoryStatus
+ detail.toLocationCode = this.toLocationCode
subList.push(detail)
}
})
@@ -382,19 +373,19 @@
scanPopupGetFocus() {
- this.$refs.scanPopup.packGetFocus();
+ this.$refs.scanPopup.getfocus();
},
scanPopupLoseFocus() {
- this.$refs.scanPopup.packLoseFocus();
+ this.$refs.scanPopup.losefocus();
},
showMessage(message) {
setTimeout(r => {
- // this.scanPopupLoseFocus();
+ this.scanPopupLoseFocus();
this.$refs.comMessage.showMessage(message, res => {
if (res) {
- // this.scanPopupGetFocus();
+ this.scanPopupGetFocus();
}
});
})
diff --git a/pages/productReceipt/job/productReceiptJob.vue b/pages/productReceipt/job/productReceiptJob.vue
index 245dedb1..d2730f53 100644
--- a/pages/productReceipt/job/productReceiptJob.vue
+++ b/pages/productReceipt/job/productReceiptJob.vue
@@ -128,7 +128,7 @@
this.loadingType = "loading";
if (type === "refresh") {
this.pageNo = 1;
- this.receiptList = [];
+ this.jobList = [];
}
var filters = []
if (this.checkedToday) {
diff --git a/pages/productionReceipt/job/productionReceiptDetail.vue b/pages/productionReceipt/job/productionReceiptDetail.vue
index c45c757b..0d078716 100644
--- a/pages/productionReceipt/job/productionReceiptDetail.vue
+++ b/pages/productionReceipt/job/productionReceiptDetail.vue
@@ -10,7 +10,7 @@
-
+
-
+
diff --git a/pages/productionReturn/coms/comReturnRequestCreator.vue b/pages/productionReturn/coms/comReturnRequestCreator.vue
index f1f0bffc..698454e0 100644
--- a/pages/productionReturn/coms/comReturnRequestCreator.vue
+++ b/pages/productionReturn/coms/comReturnRequestCreator.vue
@@ -1,88 +1,159 @@
-
-
-
-
-
-
-
-
-
-
-
- 生产线 : {{item.productionLineName}}({{item.productionLineCode}})
-
-
- 工位 : {{item.workStationName}} ({{item.workStationCode}})
-
-
- 物品代码 : {{item.itemCode}}
-
-
- 物品名称 : {{item.itemName}}
-
-
-
-
- 数量 : {{item.qty}} 单位 :
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/pages/productionReturn/coms/comReturnRequestInfo.vue b/pages/productionReturn/coms/comReturnRequestInfo.vue
index fbb64a31..a7b40d91 100644
--- a/pages/productionReturn/coms/comReturnRequestInfo.vue
+++ b/pages/productionReturn/coms/comReturnRequestInfo.vue
@@ -14,8 +14,8 @@
{{ dataContent.workStationCode }}
- 原材料库
- {{ dataContent.toLocationCode}}
+ 来源库位
+ {{ dataContent.fromLocationCode}}
diff --git a/pages/productionReturn/request/requestDetail.vue b/pages/productionReturn/request/requestDetail.vue
index 1acd47b1..262f5f83 100644
--- a/pages/productionReturn/request/requestDetail.vue
+++ b/pages/productionReturn/request/requestDetail.vue
@@ -1,5 +1,9 @@
+
@@ -33,12 +37,15 @@
import comRequestDetailCard from "@/mycomponents/detail/comRequestDetailCard.vue"
import requestDetailInfoPopup from '@/pages/productionReturn/coms/requestDetailInfoPopup.vue'
import comMessage from '@/mycomponents/common/comMessage.vue'
-
+ import comReturnRequestInfo from '@/pages/productionReturn/coms/comReturnRequestInfo.vue'
+
+
export default {
components: {
comRequestDetailCard,
requestDetailInfoPopup,
comMessage,
+ comReturnRequestInfo
},
data() {
return {
@@ -84,7 +91,10 @@
that.requestContent = res.data;
that.subList = res.data.subList;
that.detailSource = getDataSource(that.subList);
- that.detailSource[0].workshopCode = that.requestContent.workshopCode
+ that.requestContent.fromLocationCode = that.subList[0].fromLocationCode
+ that.requestContent.productionLineCode = that.subList[0].productionLineCode
+ that.requestContent.workStationCode = that.subList[0].workStationCode
+
} else {
that.showMessage('列表数据为0');
}
diff --git a/pages/productionReturn/request/returnRequestCreate.vue b/pages/productionReturn/request/returnRequestCreate.vue
index b78163de..af9ebef1 100644
--- a/pages/productionReturn/request/returnRequestCreate.vue
+++ b/pages/productionReturn/request/returnRequestCreate.vue
@@ -36,6 +36,7 @@
updateTitle,
navigateBack,
getRemoveOption,
+ getCurrDateOneMonthsTimes
} from '@/common/basic.js';
import comBlankView from '@/mycomponents/common/comBlankView.vue'
@@ -44,7 +45,6 @@
import comScanReturnPack from '@/pages/productionReturn/coms/comScanReturnPack.vue'
import comMessage from '@/mycomponents/common/comMessage.vue'
import comReturnRequestCreator from '@/pages/productionReturn/coms/comReturnRequestCreator.vue'
-
export default {
name: '',
components: {
@@ -53,7 +53,7 @@
jobDetailPopup,
comScanReturnPack,
comMessage,
- comReturnRequestCreator
+ comReturnRequestCreator,
},
data() {
return {
@@ -95,7 +95,12 @@
if (this.detailSource.subList.length == 0) {
this.detailSource = {
workshopCode: item.workshopCode,
- businessType:this.fromType,
+ workShopName: item.workShopName,
+ productionLineCode: item.productionLineCode,
+ productionLineName: item.productionLineName,
+ workStationCode: item.workStationCode,
+ workStationName: item.workStationName, //工位
+ fromLocationCode:item.rawLocationCode,
status: "1",
totalQty: 0,
subList: []
@@ -126,6 +131,9 @@
workStationCode: item.workStationCode,
itemCode: item.itemCode,
itemName: item.itemName,
+ inventoryStatus:"OK",
+ packingNumber:"",
+ fromLocationCode:item.rawLocationCode,
qty: item.qty,
uom: item.uom
}
@@ -139,9 +147,6 @@
}
}
this.caclcQty();
- if (this.$refs.issueRequest != undefined) {
- this.$refs.issueRequest.update()
- }
},
caclcQty() {
@@ -153,14 +158,17 @@
},
setParams() {
+ //合格退料
if(this.fromType=="ReturnToStore"){
this.detailSource.isOK = true
+ this.detailSource.dueTime = getCurrDateOneMonthsTimes()
this.detailSource.subList.forEach(res => {
res.batch ="000000"
})
-
+ //隔离退料
}else if(this.fromType=="ReturnToHold"){
this.detailSource.isOK = false
+ this.detailSource.dueTime = getCurrDateOneMonthsTimes()
this.detailSource.subList.forEach(res => {
res.batch = ""
})
@@ -177,7 +185,7 @@
productionReturnRequestCreate(params).then(res => {
uni.hideLoading()
if (res.data) {
- this.showCommitSuccessMessage("提交成功
生成发料申请" + res.data)
+ this.showCommitSuccessMessage("提交成功
生成发料申请
" + res.data)
} else {
this.showErrorMessage("提交失败[" + res.msg + "]")
}
diff --git a/pages/purchaseReceipt/coms/comReceiptDetailCard.vue b/pages/purchaseReceipt/coms/comReceiptDetailCard.vue
index c54c811b..07b4fb5f 100644
--- a/pages/purchaseReceipt/coms/comReceiptDetailCard.vue
+++ b/pages/purchaseReceipt/coms/comReceiptDetailCard.vue
@@ -10,7 +10,7 @@
-
+
diff --git a/pages/purchaseReturn/record/returnRecord.vue b/pages/purchaseReturn/record/returnRecord.vue
index 4468b608..f520d534 100644
--- a/pages/purchaseReturn/record/returnRecord.vue
+++ b/pages/purchaseReturn/record/returnRecord.vue
@@ -40,7 +40,7 @@
+
+
diff --git a/pages/putaway/job/putawayDetail.vue b/pages/putaway/job/putawayDetail.vue
index a64d98c8..ffb98f35 100644
--- a/pages/putaway/job/putawayDetail.vue
+++ b/pages/putaway/job/putawayDetail.vue
@@ -183,7 +183,6 @@
} else {
if (res.data.subList.length > 0) {
that.jobContent = res.data;
- that.jobContent.outInventoryStatuses='INSP'
that.subList = res.data.subList;
that.detailSource = getDataSource(that.subList)
@@ -301,6 +300,7 @@
if (res) {
itemDetail.scaned = true;
itemDetail.handleQty = Number(result.balance.qty) ;
+ itemDetail.toInventoryStatus =result.balance.inventoryStatus
itemDetail.balance = result.balance;
itemDetail.balance.balanceQty = result.balance.qty;
itemDetail.balance.stdPackQty = result.package.stdPackQty
@@ -313,6 +313,7 @@
} else {
itemDetail.scaned = true;
itemDetail.handleQty = Number(result.balance.qty) ;
+ itemDetail.toInventoryStatus =itemDetail.inventoryStatus
itemDetail.balance = result.balance;
itemDetail.balance.balanceQty = result.balance.qty;
itemDetail.balance.stdPackQty = result.package.stdPackQty
@@ -439,8 +440,6 @@
detail.toPackingNumber = info.packingNumber;
detail.toBatch = info.batch;
detail.toContainerNumber = '';
- detail.toInventoryStatus = detail.inventoryStatus;
-
detail.singlePrice = detail.balance.singlePrice;
detail.amount = detail.balance.singlePrice * detail.handleQty;
@@ -448,9 +447,6 @@
detail.arriveDate = detail.balance.arriveDate;
detail.produceDate = detail.balance.produceDate;
detail.expireDate = detail.balance.expireDate;
- // "arriveDate": 1694591614000,
- // "produceDate": 1694591615000,
- // "expireDate": 1694591617000,
subList.push(detail)
}
})
diff --git a/pages/repleinsh/coms/comScanReplishPack.vue b/pages/repleinsh/coms/comScanReplishPack.vue
index d441399f..95f1824c 100644
--- a/pages/repleinsh/coms/comScanReplishPack.vue
+++ b/pages/repleinsh/coms/comScanReplishPack.vue
@@ -7,7 +7,7 @@
扫描箱码
关闭
-