diff --git a/src/api/request2.js b/src/api/request2.js
index f523922c..bff958ec 100644
--- a/src/api/request2.js
+++ b/src/api/request2.js
@@ -2304,9 +2304,9 @@ export function productDismantleRecordSubmit(params) {
*/
export function productDismantleJobClose(params) {
return request({
- url: baseApi + "/wms/purchasereceipt-job-main/refusal?id="+params,
- method: "put",
- data: {},
+ url: baseApi + "/wms/purchasereceipt-job-main/refusal",
+ method: "post",
+ data: params,
});
}
diff --git a/src/mycomponents/balance/balance.vue b/src/mycomponents/balance/balance.vue
index 3239f206..a1e31de1 100644
--- a/src/mycomponents/balance/balance.vue
+++ b/src/mycomponents/balance/balance.vue
@@ -2,28 +2,40 @@
-
+
-
-
-
-
-
+
+
-
- 复制
+
+
+
+
+
+
+
+
+ 复制
+
+
+
+
+
+
+
+
@@ -38,6 +50,7 @@
import recommendQty from '@/mycomponents/qty/recommendQty.vue'
import compareQty from '@/mycomponents/qty/compareQty.vue'
import config from '@/static/config.js'
+ import moveStatus from '@/mycomponents/balance/moveStatus.vue'
export default {
components: {
@@ -48,6 +61,7 @@
qty,
recommendQty,
compareQty,
+ moveStatus
},
data() {
diff --git a/src/pages/purchaseReceipt/job/receiptDetail.vue b/src/pages/purchaseReceipt/job/receiptDetail.vue
index 6cebe18c..3f016a43 100644
--- a/src/pages/purchaseReceipt/job/receiptDetail.vue
+++ b/src/pages/purchaseReceipt/job/receiptDetail.vue
@@ -14,6 +14,13 @@
@change="switchChange">
+
+
+
+
+
+
+
@@ -73,7 +80,7 @@
getCurrDateTime,
getPackingNumberAndBatch,
compareAsc,
- navigateBack,
+ navigateBack,
getSwitchInfoByCode
} from '@/common/basic.js';
@@ -134,9 +141,10 @@
jobStatus: "",
isAllReceived: false,
operation: '',
- scanedPackingNumber: '',
- status:'',
- switchCode:''
+ scanedPackingNumber: '',
+ status: '',
+ switchCode: '',
+ reasonText: ""
};
},
@@ -145,23 +153,23 @@
this.id = option.id;
this.scanedPackingNumber = option.scaned || '';
this.operation = option.operation;
- this.status = option.status;
- this.switchCode = "purchasereceiptPrintPDA"
-
-
- },
-
- onShow(){
- if (this.id != undefined) {
- //新建的任务自动接收
- if (this.status == "1") {
- this.receive((callback => {
- this.getDetail();
- }));
- } else {
- this.getDetail();
- }
- }
+ this.status = option.status;
+ this.switchCode = "purchasereceiptPrintPDA"
+
+
+ },
+
+ onShow() {
+ if (this.id != undefined) {
+ //新建的任务自动接收
+ if (this.status == "1") {
+ this.receive((callback => {
+ this.getDetail();
+ }));
+ } else {
+ this.getDetail();
+ }
+ }
},
//返回首页
onNavigationBarButtonTap(e) {
@@ -239,11 +247,13 @@
if (this.scanedPackingNumber && this
.scanedPackingNumber == s
.packingNumber) {
- s.scaned = true
- s.cancleScanedHiht = true
-
- s.copyContent = "HPQ;V1.0;I" + s.itemCode + ";P" + s.packingNumber + ";B" + s.batch + ";Q" + s.qty
- this.$refs.scanPopup.simulateScan(s);
+ s.scaned = true
+ s.cancleScanedHiht = true
+
+ s.copyContent = "HPQ;V1.0;I" + s.itemCode +
+ ";P" + s.packingNumber + ";B" + s.batch +
+ ";Q" + s.qty
+ this.$refs.scanPopup.simulateScan(s);
this.scanedPackingNumber = ''
}
})
@@ -260,8 +270,8 @@
},
- getScanResult(result) {
-
+ getScanResult(result) {
+
try {
var itemCode = result.label.itemCode;
var detail = this.detailSource.find(r => r.itemCode == itemCode);
@@ -275,7 +285,7 @@
if (itemDetail.length == 0) {
this.showErrorMessage("物料【" + itemCode + "】、托码【" + containerNumber + "】不在列表中")
} else {
- if (!itemDetail[0].cancleScanedHiht&&itemDetail[0].scaned) {
+ if (!itemDetail[0].cancleScanedHiht && itemDetail[0].scaned) {
this.showErrorMessage("物料【" + itemCode + "】、托码【" + containerNumber + "】已经扫描")
} else {
itemDetail.forEach(item => {
@@ -322,7 +332,7 @@
if (isExit == undefined) {
this.showMessage("箱码【" + packingNumber + "】、批次【" + batch + "】不在列表中")
} else {
- if (!isExit.cancleScanedHiht&&isExit.scaned) {
+ if (!isExit.cancleScanedHiht && isExit.scaned) {
this.showMessage("箱码【" + packingNumber + "】已经扫描")
} else {
isExit.scaned = true
@@ -340,7 +350,8 @@
scanedLength++;
}
})
- if (!itemDetail.cancleScanedHiht&&itemDetail.scaned && scanedLength == itemDetail.packList.length) {
+ if (!itemDetail.cancleScanedHiht && itemDetail.scaned && scanedLength == itemDetail
+ .packList.length) {
this.showMessage("箱码【" + packingNumber + "】已经扫描")
} else {
itemDetail.scaned = true;
@@ -440,13 +451,21 @@
},
reject() {
+ if(!this.reasonText){
+ this.showMessage("请输入拒收原因")
+ return;
+ }
this.$refs.comMessage.showQuestionMessage('是否要拒收任务
[' + this.jobContent.asnNumber + ']?', res => {
if (res) {
uni.showLoading({
title: "提交中....",
mask: true
});
- productDismantleJobClose(this.id).then(res => {
+ var params = {
+ id: this.id,
+ refuseReason: this.reasonText
+ }
+ productDismantleJobClose(params).then(res => {
console.log('拒收', res)
if (res.data) {
navigateBack(1)
@@ -476,71 +495,77 @@
if (res.success) {
this.managementList = res.list;
var params = this.setParams()
- purchaseReceiptJobSubmit(params).then(res => {
-
-
- if (res.data) {
- let isCheckPrint = getSwitchInfoByCode(this.switchCode)
- if(!isCheckPrint){
- uni.hideLoading()
-
- this.showCommitSuccessMessage("提交成功
生成采购收货记录
" + res.data.number)
- }else{
- uni.showLoading({
- title: "提交成功,将跳转到打印页面",
- mask: true
- });
-
- // 获取上架任务
- let timerCount = 0
- const timer1 = setInterval(async () => {
- if (timerCount == 15) {
- clearInterval(timer1)
- uni.showToast({
- title: "跳转打印页面失败",
- icon: "none"
- });
- return;
- }
- await getPutawayJobList({
- filters: [{
- column: "purchaseReceiptRecordNumber",
- action: "in",
- value: res.data.number
- }],
- pageNo: 1,
- pageSize: 1000,
- }).then(res1 => {
- timerCount = timerCount + 1
- if (res1.data && res1.data.list && res1.data
- .list.length && (res1.data.total >= res
- .data.detailCount)) {
- uni.hideLoading()
- clearInterval(timer1)
- const dataParams = {
- toLocationCode: res1.data.list[0]
- .toLocationCode,
- number: res1.data.list[0].number,
- creator: res1.data.list[0].creator,
- createTime: res1.data.list[0]
- .createTime,
- ids: res1.data.list.map(item =>
- item.masterId).join(',')
- }
- console.log(dataParams)
- uni.redirectTo({
- url: '/pages/pointPutawayJob/index?data=' +
- encodeURIComponent(JSON
- .stringify(dataParams))
- })
- }
- })
- }, 2000)
-
-
- }
-
-
+ purchaseReceiptJobSubmit(params).then(res => {
+
+
+ if (res.data) {
+ let isCheckPrint = getSwitchInfoByCode(this.switchCode)
+ if (!isCheckPrint) {
+ uni.hideLoading()
+
+ this.showCommitSuccessMessage("提交成功
生成采购收货记录
" + res.data.number)
+ } else {
+ uni.showLoading({
+ title: "提交成功,将跳转到打印页面",
+ mask: true
+ });
+
+ // 获取上架任务
+ let timerCount = 0
+ const timer1 = setInterval(async () => {
+ if (timerCount == 15) {
+ clearInterval(timer1)
+ uni.showToast({
+ title: "跳转打印页面失败",
+ icon: "none"
+ });
+ return;
+ }
+ await getPutawayJobList({
+ filters: [{
+ column: "purchaseReceiptRecordNumber",
+ action: "in",
+ value: res.data.number
+ }],
+ pageNo: 1,
+ pageSize: 1000,
+ }).then(res1 => {
+ timerCount = timerCount + 1
+ if (res1.data && res1.data.list && res1
+ .data
+ .list.length && (res1.data.total >= res
+ .data.detailCount)) {
+ uni.hideLoading()
+ clearInterval(timer1)
+ const dataParams = {
+ toLocationCode: res1.data.list[
+ 0]
+ .toLocationCode,
+ number: res1.data.list[0]
+ .number,
+ creator: res1.data.list[0]
+ .creator,
+ createTime: res1.data.list[0]
+ .createTime,
+ ids: res1.data.list.map(item =>
+ item.masterId).join(
+ ',')
+ }
+ console.log(dataParams)
+ uni.redirectTo({
+ url: '/pages/pointPutawayJob/index?data=' +
+ encodeURIComponent(JSON
+ .stringify(
+ dataParams))
+ })
+ }
+ })
+ }, 2000)
+
+
+ }
+
+
} else {
this.showErrorMessage("提交失败[" + res.msg + "]")
}
@@ -693,7 +718,7 @@
},
- showCommitSuccessMessage(hint) {
+ showCommitSuccessMessage(hint) {
this.$refs.comMessage.showSuccessMessage(hint, res => {
navigateBack(1)
diff --git a/src/pages/unPlanned/record/issueRecord.vue b/src/pages/unPlanned/record/issueRecord.vue
index ffe8fda5..89e1fb3a 100644
--- a/src/pages/unPlanned/record/issueRecord.vue
+++ b/src/pages/unPlanned/record/issueRecord.vue
@@ -13,7 +13,7 @@
+ @removePack="removePack" :isShowToLocation="false">
@@ -151,7 +151,7 @@
if (item == undefined) {
var itemp = createItemInfo(balance, pack);
let newDetail = createDetailInfo(balance, pack); //
- newDetail.inventoryStatus ="OK";
+ // newDetail.inventoryStatus ="OK";
itemp.subList.push(newDetail);
this.detailSource.push(itemp)
} else {