diff --git a/api/request2.js b/api/request2.js
index c52eeba3..dfbf8ad3 100644
--- a/api/request2.js
+++ b/api/request2.js
@@ -1367,8 +1367,8 @@ export function unPlannedIssueJobSubmit(params) {
*/
export function unPlannedIssueRequestSubmit(params) {
return request({
- url: baseApi + "/magic-api/pda/job/purchasereturn/jobSubmit",
- method: "put",
+ url: baseApi + "/wms/unplannedissue-request-main/create",
+ method: "post",
data: params,
});
}
diff --git a/common/basic.js b/common/basic.js
index 68e219a3..b170962e 100644
--- a/common/basic.js
+++ b/common/basic.js
@@ -732,8 +732,13 @@ export function getISODateTime() {
//格式化处理
export function dateFormat(time) {
- let date = new Date(time);
- return getDate(date) + " " + getTime(date);
+ var result = ""
+ if(time!=null){
+ let date = new Date(time);
+ result = getDate(date) + " " + getTime(date);
+ }
+
+ return result;
}
//获取日期部分
diff --git a/pages/unPlanned/job/issueJobDetail.vue b/pages/unPlanned/job/issueJobDetail.vue
index d7b47284..7d73b674 100644
--- a/pages/unPlanned/job/issueJobDetail.vue
+++ b/pages/unPlanned/job/issueJobDetail.vue
@@ -296,17 +296,17 @@
//没有目标库位,不查询管理模式
var params = this.setParams()
console.log("提交参数", JSON.stringify(params));
- // unPlannedIssueJobSubmit(params).then(res => {
- // uni.hideLoading()
- // if (res.data) {
- // this.showCommitSuccessMessage("提交成功
生成计划外出库记录" + res.data )
- // } else {
- // this.showErrorMessage("提交失败[" + res.msg + "]")
- // }
- // }).catch(error => {
- // uni.hideLoading()
- // this.showErrorMessage(error)
- // })
+ unPlannedIssueJobSubmit(params).then(res => {
+ uni.hideLoading()
+ if (res.data) {
+ this.showCommitSuccessMessage("提交成功
生成计划外出库记录
" + res.data )
+ } else {
+ this.showErrorMessage("提交失败[" + res.msg + "]")
+ }
+ }).catch(error => {
+ uni.hideLoading()
+ this.showErrorMessage(error)
+ })
},
@@ -317,6 +317,9 @@
this.detailSource.forEach(item => {
item.subList.forEach(detail => {
if (detail.scaned) {
+ detail.toPackingNumber = detail.packingNumber;
+ detail.toContainerNumber = '';
+ detail.toBatch = detail.batch;
subList.push(detail)
}
})
@@ -327,10 +330,6 @@
},
-
-
-
-
showMessage(message) {
setTimeout(r => {
this.scanPopupLoseFocus();