diff --git a/api/request2.js b/api/request2.js
index 9d9e7066..b1842224 100644
--- a/api/request2.js
+++ b/api/request2.js
@@ -1352,7 +1352,7 @@ export function cancleTakeProductReceiptJob(id) {
}
/**
- * 制品收货 提交
+ * 制品收货任务 提交
* @param {*} params
*/
export function productReceiptJobsubmit( params) {
@@ -1363,6 +1363,20 @@ export function productReceiptJobsubmit( params) {
});
}
+/**
+ * 制品收货记录 提交
+ * @param {*} params
+ */
+export function productReceiptRecordsubmit( params) {
+ return request({
+ url: baseApi + "/wms/productreceipt-record-main/create",
+ method: "post",
+ data: params,
+ });
+}
+
+
+
/**
* 制品上架 任务
* status 任务状态
@@ -1441,8 +1455,8 @@ export function productPutawayJobSubmit(params) {
*/
export function productPutawayRecordSubmit(params) {
return request({
- url: baseApi + "/magic-api/pda/job/purchasereceipt/jobSubmit",
- method: "put",
+ url: baseApi + "/wms/productputaway-record-main/create",
+ method: "post",
data: params,
});
}
@@ -1971,13 +1985,13 @@ export function getProductPutawayRequestDetail(id) {
}
/**
- * 制品上架 申请提交
+ * 制品上架申请 提交
* @param {*} params
*/
export function productPutawayRequestSubmit(params) {
return request({
- url: baseApi + "/wms/purchasereturn-request-main/submit",
- method: "put",
+ url: baseApi + "/wms/productputaway-request-main/create",
+ method: "post",
data: params,
});
}
@@ -2095,7 +2109,7 @@ export function cancleTakeProductionReturnJob(id) {
*/
export function productionReturnJobSubmit( params) {
return request({
- url: baseApi + "/magic-api/pda/job/purchasereceipt/jobSubmit?id=" + id,
+ url: baseApi + "/magic-api/pda/job/purchasereceipt/jobSubmit",
method: "put",
data: params,
});
diff --git a/mycomponents/detail/comDetailCard.vue b/mycomponents/detail/comDetailCard.vue
index e5e6fd93..1c663da4 100644
--- a/mycomponents/detail/comDetailCard.vue
+++ b/mycomponents/detail/comDetailCard.vue
@@ -11,7 +11,7 @@
-
+
diff --git a/pages/inspect/coms/comInspectJobCard.vue b/pages/inspect/coms/comInspectJobCard.vue
index 393947ec..ec68ce9a 100644
--- a/pages/inspect/coms/comInspectJobCard.vue
+++ b/pages/inspect/coms/comInspectJobCard.vue
@@ -37,7 +37,6 @@
methods: {
getInspectType(value){
- console.log("返回1",getInspectType(value))
return getInspectType(value)
}
diff --git a/pages/putaway/record/putawayRecord.vue b/pages/putaway/record/putawayRecord.vue
index 862a4030..c5e6778b 100644
--- a/pages/putaway/record/putawayRecord.vue
+++ b/pages/putaway/record/putawayRecord.vue
@@ -8,7 +8,7 @@
-
@@ -98,7 +98,7 @@
id: '',
receiptJob: {},
received: false,
- jobContent: {}, //任务内容
+ dataContent: {}, //任务内容
detailSource: [], //绑定在页面上的数据源
locationTypeList: [],
businessTypeInfo: {},
@@ -260,7 +260,7 @@
});
if (this.fromType == "requestType") {
- var params = this.setParams(false)
+ var params = this.setRequestParams()
console.log("提交" + JSON.stringify(params))
// putawayRequestSubmit(params).then(res => {
// uni.hideLoading()
@@ -311,8 +311,6 @@
this.detailSource.forEach(item => {
item.subList.forEach(detail => {
if (detail.scaned) {
- // var subItem = {};
- // Object.assign(subItem, detail)
if (queryModel) {
var info = getPackingNumberAndBatch(this.managementList, detail.itemCode,
detail.packingNumber, detail.batch);
@@ -322,20 +320,46 @@
detail.toInventoryStatus = detail.inventoryStatus
detail.toLocationCode = this.toLocationCode
} else {
- detail.toPackingNumber = detail.packingNumber;
- detail.toContainerNumber = detail.containerNumber
- detail.toBatch = detail.toBatch;
- detail.toInventoryStatus = detail.inventoryStatus
- detail.toLocationCode = ""
+ // detail.toPackingNumber = detail.packingNumber;
+ // detail.toContainerNumber = detail.containerNumber
+ // detail.toBatch = detail.toBatch;
+ // detail.toInventoryStatus = detail.inventoryStatus
+ // detail.toLocationCode = ""
}
subList.push(detail)
}
})
})
- this.jobContent.subList = subList
- this.jobContent.creator = creator;
- return this.jobContent;
+ this.dataContent.subList = subList
+ this.dataContent.creator = creator;
+ return this.dataContent;
+ },
+
+ setRequestParams(){
+ var subList = []
+ var supplierCode=""
+ this.detailSource.forEach(item => {
+ item.subList.forEach(detail => {
+ if (detail.scaned) {
+ if(supplierCode==""){
+ supplierCode = detail.package.supplierCode
+ }
+ subList.push(detail)
+ }
+ })
+ })
+
+ this.dataContent.subList = subList
+ this.dataContent.supplierCode = supplierCode
+ this.dataContent.businessType = "PurchasePutaway"
+ this.dataContent.departmentCode= "研发部门";
+ this.dataContent.status= 1 ;
+ this.dataContent.autoCommit = "FALSE";
+ this.dataContent.autoAgree = "FALSE";
+ this.dataContent.autoExecute = "FALSE";
+ this.dataContent.directCreateRecord = "FALSE";
+ return this.dataContent;
},
diff --git a/store/modules/user.js b/store/modules/user.js
index 10ff141c..5e259231 100644
--- a/store/modules/user.js
+++ b/store/modules/user.js
@@ -97,9 +97,9 @@ const user = {
resolve(res)
}).catch(error => {
reject(error)
- uni.showToast({
- title:"用户信息获取失败"
- })
+ // uni.showToast({
+ // title:"用户信息获取失败"
+ // })
})
})
},