diff --git a/api/request2.js b/api/request2.js
index d5348b3d..6f0298f4 100644
--- a/api/request2.js
+++ b/api/request2.js
@@ -1619,27 +1619,27 @@ export function getProductPutawayJobDetail(id) {
}
/**
- * 制品上架 承接
+ * 制品上架任务 承接
* @param {*} id
*
*/
export function takeProductPutawayJob(id) {
return request({
- url: baseApi + "/wms/purchasereceipt-job-main/abandon?id=" + id,
+ url: baseApi + "/wms/productputaway-job-main/accept?id=" + id,
method: "put",
data: {},
});
}
/**
- * 制品上架 放弃承接
+ * 制品上架任务 放弃承接
* @param {*} id
*
*/
export function cancleTakeProductPutawayJob(id) {
return request({
- url: baseApi + "/wms/purchasereceipt-job-main/abandon?id=" + id,
- method: "get",
+ url: baseApi + "/wms/productputaway-job-main/abandon?id=" + id,
+ method: "put",
data: {},
});
}
diff --git a/pages/inspect/job/inspectFullDetail.vue b/pages/inspect/job/inspectFullDetail.vue
index 539eb678..39bf545f 100644
--- a/pages/inspect/job/inspectFullDetail.vue
+++ b/pages/inspect/job/inspectFullDetail.vue
@@ -148,24 +148,24 @@
},
methods: {
- deleteFileById(id){
- deleteFileById(id).then(res=>{
-
- })
-
+ deleteFileById(id) {
+ deleteFileById(id).then(res => {
+
+ })
+
},
- getFileList(id){
+ getFileList(id) {
getFileList("jobInspectDetail", id).then(res => {
- if(res.data){
- res.data.forEach(res=>{
+ if (res.data) {
+ res.data.forEach(res => {
this.deleteFileById(res.id)
})
}
})
},
-
- clearPicList(subList){
- subList.forEach(item=>{
+
+ clearPicList(subList) {
+ subList.forEach(item => {
this.getFileList(item.id)
})
},
@@ -353,23 +353,33 @@
commit() {
this.scanCount = getScanCount(this.subList);
- // if (this.scanCount == 0) {
- // this.showErrorMessage("扫描数为0,请先扫描")
- // return;
- // }
- //如果是全检,必须全部扫描-------改为:任务中的是否允许部分提交:nxt 2023年12月13日
- if (this.jobContent.allowPartialComplete == "TRUE") {
- this.submitJob();
+
+ if (this.scanCount == 0) {
+ this.showErrorMessage("扫描数为0,请先扫描")
+ return;
} else {
- //不允许部分提交,提示
- this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交
' + "已经扫描[" + this.scanCount +
- "]箱总共[" + this
- .subList.length + "]箱", res => {
- if (res) {
- this.openScanPopup();
- }
- });
+ if (this.scanCount == this.subList.length) {
+ this.submitJob();
+ } else {
+ //如果是全检,必须全部扫描-------改为:任务中的是否允许部分提交: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();
+ }
+ });
+ }
+ }
}
+
+
+
+
},
submitJob() {
diff --git a/static/config.json b/static/config.json
index 68341504..259a68f5 100644
--- a/static/config.json
+++ b/static/config.json
@@ -18,7 +18,7 @@
"request_url": {
"name": "request_url",
- "value": "http://192.168.0.157:12080/admin-api",
+ "value": "http://192.168.0.230:12080/admin-api",
"dev2": "http://192.168.0.157:12080/admin-api",
"chefang": "http://192.168.0.178:12080/admin-api",
"chenxinming": "http://192.168.0.230:12080/admin-api",