Browse Source

采购接收批次号

master
han\hanst 4 months ago
parent
commit
636b3755cc
  1. 2
      src/api/po/po.js
  2. 33
      src/views/modules/recv/recv.vue

2
src/api/po/po.js

@ -7,6 +7,8 @@ export const getPoList = data => createAPI(`po/getPoList`,'post',data)
// 接收采购单信息 // 接收采购单信息
export const receivePo = data => createAPI(`po/receivePo`,'post',data) export const receivePo = data => createAPI(`po/receivePo`,'post',data)
// 获取下一个itemNo
export const getNextItemNo = data => createAPI(`po/getNextItemNo`,'post',data)
// 获取待检验入库单列表 // 获取待检验入库单列表
export const getQualifiedInspectionList = data => createAPI(`inspection/getQualifiedInspectionList`,'post',data) export const getQualifiedInspectionList = data => createAPI(`inspection/getQualifiedInspectionList`,'post',data)

33
src/views/modules/recv/recv.vue

@ -130,7 +130,7 @@
</template> </template>
<script> <script>
import { getPoList, receivePo,printLabel } from "@/api/po/po.js";
import { getPoList, receivePo, printLabel, getNextItemNo } from "@/api/po/po.js";
export default { export default {
data() { data() {
@ -189,7 +189,7 @@ export default {
} }
}); });
}, },
recvLine(row) {
async recvLine(row) {
/* if (row.receiveCaseDB!='INVDIR' && row.receiveCaseDB!='QAINV') { /* if (row.receiveCaseDB!='INVDIR' && row.receiveCaseDB!='QAINV') {
return this.$message.warning("该采购订单行的收货方式为"+row.receiveCase+",无法接收"); return this.$message.warning("该采购订单行的收货方式为"+row.receiveCase+",无法接收");
}*/ }*/
@ -199,12 +199,30 @@ export default {
if (row.status === 'Stopped' || row.status === 'Closed' || row.status === 'Cancelled') { if (row.status === 'Stopped' || row.status === 'Closed' || row.status === 'Cancelled') {
return this.$message.warning("该采购订单行状态为"+row.status+",无法接收"); return this.$message.warning("该采购订单行状态为"+row.status+",无法接收");
} }
// itemNo
let nextItemNo = 1;
try {
const { data } = await getNextItemNo({
orderNo: row.orderNo,
lineNo: row.lineNo,
releaseNo: row.releaseNo || ''
});
if (data.code === 0) {
nextItemNo = data.data;
}
} catch (error) {
console.error('获取itemNo失败:', error);
// 使1
}
this.recvItem = { this.recvItem = {
...row, ...row,
poNo: row.poNumber || this.scanCode, poNo: row.poNumber || this.scanCode,
dueinQty: row.qtyToReceive || row.invQtyToReceive, dueinQty: row.qtyToReceive || row.invQtyToReceive,
transQty: '', transQty: '',
batchNo: row.partNo+'-'+row.lineNo+'-'+row.releaseNo+'-'+1,
itemNo: nextItemNo,
batchNo: row.partNo+'-'+row.lineNo+'-'+row.releaseNo+'-'+nextItemNo,
deliveryDate: row.plannedDeliveryDate || '', deliveryDate: row.plannedDeliveryDate || '',
arrivalDate: this.getCurrentDate(), arrivalDate: this.getCurrentDate(),
supplierBatchNo: '', supplierBatchNo: '',
@ -270,7 +288,7 @@ export default {
transQty: item.transQty, transQty: item.transQty,
batchNo: item.batchNo, batchNo: item.batchNo,
locationNo: item.locationNo, locationNo: item.locationNo,
itemNo: 1,
itemNo: item.itemNo,
wdr: item.wdr || '*', wdr: item.wdr || '*',
deliveryDate: item.deliveryDate, deliveryDate: item.deliveryDate,
arrivalDate: item.arrivalDate, arrivalDate: item.arrivalDate,
@ -303,7 +321,7 @@ export default {
if (data.code === 0) { if (data.code === 0) {
this.$message.success("操作成功"); this.$message.success("操作成功");
this.clearAllHandlingUnitCache(); this.clearAllHandlingUnitCache();
this.printViaServer(data.data); //
this.printViaServer(data.data,item.needCheck); //
this.processFlag = 1; this.processFlag = 1;
this.scanCode = ''; this.scanCode = '';
this.poList = []; this.poList = [];
@ -322,7 +340,7 @@ export default {
/** /**
* 通过服务器打印 * 通过服务器打印
*/ */
async printViaServer(receiptNo) {
async printViaServer(receiptNo,needCheck) {
this.$emit('print-start') this.$emit('print-start')
try { try {
const printRequest = { const printRequest = {
@ -334,7 +352,8 @@ export default {
userId: localStorage.getItem('userName'), userId: localStorage.getItem('userName'),
username: localStorage.getItem('userName'), username: localStorage.getItem('userName'),
site: localStorage.getItem('site'), site: localStorage.getItem('site'),
receiptNo: receiptNo
receiptNo: receiptNo,
needCheck:needCheck
} }
const { data } = await printLabel(printRequest) const { data } = await printLabel(printRequest)
if (data.code === 200) { if (data.code === 200) {

Loading…
Cancel
Save