diff --git a/src/api/request2.js b/src/api/request2.js index 1b5cf8fa..55b471b9 100644 --- a/src/api/request2.js +++ b/src/api/request2.js @@ -4236,3 +4236,32 @@ export function getBusinessType() { data:{} }); } + +/** + * 获取生产计划信息通过生产线和日期 + * @param {*} + */ + +export function getPlaneInfoByproductLine(productionLine,planDate) { + return request({ + url: baseApi + "/wms/production-main/getPlanProductionByProductionLineAndPlanDate?productionLine="+productionLine+"&planDate="+planDate, + method: "get", + data:{} + }); +} + +/** + * 按 + * @param {*} + */ + +export function planReceiptSubmit(params) { + return request({ + url: baseApi + "/wms/production-main/getPlanProductionByProductionLineAndPlanDate", + method: "post", + data:params + }); +} + + + diff --git a/src/common/basic.js b/src/common/basic.js index c9793c7b..93bc8860 100644 --- a/src/common/basic.js +++ b/src/common/basic.js @@ -3,7 +3,9 @@ export { maxPageSize } -import { calc } from '@/common/calc' +import { + calc +} from '@/common/calc' let jobStatusList = []; let itemStatusList = []; @@ -17,8 +19,8 @@ let unplannedReceiptReasonList = []; let unplannedIissueReason = []; let scrapReasonList = []; let inspectFailedReasonList = []; -let switchList=[] -let businessList=[] +let switchList = [] +let businessList = [] //获取字典信息 @@ -35,8 +37,8 @@ export function clearCacheData() { unplannedIissueReason = []; scrapReasonList = []; inspectFailedReasonList = []; - switchList=[] - businessList=[] + switchList = [] + businessList = [] } @@ -345,14 +347,14 @@ export function getSwitchInfoByCode(code) { if (switchList.length == 0) { switchList = uni.getStorageSync("switch") } - + for (let item of switchList) { if (item.code == code) { resultInfo = item break; } } - isCheck =resultInfo.effectiveSetValue=="TRUE"?true:false + isCheck = resultInfo.effectiveSetValue == "TRUE" ? true : false return isCheck; } @@ -362,7 +364,7 @@ export function getBusinessTypeName(code) { if (businessList.length == 0) { businessList = uni.getStorageSync("businessType") } - + for (let item of businessList) { if (item.code == code) { resultInfo = item @@ -854,7 +856,7 @@ export function getCurrDateTimes() { var time = (new Date()).getTime(); return time; } - +//2024717 export function getBatch() { var date = new Date(); var year = date.getFullYear(); //年 @@ -863,6 +865,19 @@ export function getBatch() { var batch = year.toString() + month.toString() + day.toString() return batch; } +//20270717 +export function getBatch8() { + var date = new Date(); + //获取日期部分 + var year = date.getFullYear(); //年 + var month = date.getMonth() + 1; //月 + var day = date.getDate(); //日 + + month = month < 10 ? "0" + month : month; + day = day < 10 ? "0" + day : day; + return year + month + day; +} + export function getCurrDate() { var date = new Date(); @@ -995,7 +1010,7 @@ export function getDataSource(subList) { item.subList.push(newDetail); items.push(item) } else { - item.qty = calc.add(item.qty,detail.qty) + item.qty = calc.add(item.qty, detail.qty) let newDetail = createDetailInfo(detail); // item.subList.push(newDetail); } @@ -1048,12 +1063,12 @@ export function navigateBack(backIndex) { * 深度克隆对象 * @param {*} target */ -export function deepCopyData(target) { +export function deepCopyData(target) { // 克隆原始类型和null if (!(target !== null && (typeof target === 'object' || typeof target === 'function'))) { return target; } - + let cloneTarget = Array.isArray(target) ? [] : {}; // 克隆对象和数组 for (const key in target) { @@ -1061,4 +1076,4 @@ export function deepCopyData(target) { } return cloneTarget; -} +} \ No newline at end of file diff --git a/src/pages/fg/coms/comReceiptPopup.vue b/src/pages/fg/coms/comReceiptPopup.vue index 39a32c44..15c11a1b 100644 --- a/src/pages/fg/coms/comReceiptPopup.vue +++ b/src/pages/fg/coms/comReceiptPopup.vue @@ -12,50 +12,80 @@ - - - - 生产线： + + + + 生产线： + + {{productionLineName}} - - - + + + + + - + - - 物料： - + + 物料代码： + {{itemCode}} + - + + + + 批次： + + + + + + + + + 计划数量： + + {{planQty}} + + + + + + - - 数量： - - - - - - - () - + + 包装规格： + + {{packUnit}} + + + + + + @@ -66,25 +96,26 @@ - - diff --git a/src/pages/productReceipt/job/ccProductReceiptDetail.vue b/src/pages/productReceipt/job/ccProductReceiptDetail.vue index a9cf863b..ca8dd3ea 100644 --- a/src/pages/productReceipt/job/ccProductReceiptDetail.vue +++ b/src/pages/productReceipt/job/ccProductReceiptDetail.vue @@ -139,9 +139,11 @@ }; }, onLoad(option) { - uni.setNavigationBarTitle({ - title: option.title+'详情' - }) + setTimeout(res=>{ + uni.setNavigationBarTitle({ + title: option.title+'详情' + }) + },50) this.id = option.id; this.scanedPackingNumber = option.scaned || ''; @@ -419,7 +421,7 @@ ccProductReceiptJobsubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成预生产收货记录
" + res.data, ) + this.showCommitSuccessMessage("提交成功
生成装配收货记录
" + res.data ) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/src/pages/productReceipt/job/ccProductReceiptJob.vue b/src/pages/productReceipt/job/ccProductReceiptJob.vue index 6eb4f6a4..fb668b1e 100644 --- a/src/pages/productReceipt/job/ccProductReceiptJob.vue +++ b/src/pages/productReceipt/job/ccProductReceiptJob.vue @@ -80,25 +80,28 @@ detailOptions: [], detailGiveupOptions: [], type: 'assemble', + title:"" }; }, // 装配收货：type = 'assemble' // 预生产收货：type = 'predict' - props: { - title: { - type: String, - default: '' - }, + // props: { + // title: { + // type: String, + // default: '' + // }, + // }, + + onLoad(option){ + this.title = option.title }, - - mounted() { + + onShow(){ this.detailOptions = getDetailOption(); this.detailGiveupOptions = getDetailGiveupOption(); this.getList('refresh'); }, - - onPullDownRefresh() { this.getList('refresh'); }, @@ -122,19 +125,17 @@ this.$refs.filter.openFilter(); } }, + + onReachBottom() { + console.log('onReachBottom', this.loadingType) + //避免多次触发 + if (this.loadingType == 'loading' || this.loadingType == 'noMore') { + return; + } + this.getList("more"); + }, methods: { - onReachBottom() { - console.log('onReachBottom', this.loadingType) - //避免多次触发 - if (this.loadingType == 'loading' || this.loadingType == 'noMore') { - return; - } - this.getList("more"); - }, - refresh() { - this.getList('refresh'); - }, getList(type) { let that = this; uni.showLoading({ diff --git a/src/static/icons/down.svg b/src/static/icons/down.svg new file mode 100644 index 00000000..576dd9c9 --- /dev/null +++ b/src/static/icons/down.svg @@ -0,0 +1 @@ + \ No newline at end of file