MES-WEB-VUEUI.git

			@@ -4,11 +4,12 @@
			<el-button type="primary" @click="onClickMethod_BarCodeProduce" :disabled="disabledFlag_BarCodeProduce">生成</el-button>
			<el-button type="primary" @click="get_PrintReport">打印</el-button>
			<el-button type="primary" @click="get_BarCodeBillList">条码档案</el-button>
			<el-button type="primary" @click="get_BarCodeBillHSEQ">条码行号查询</el-button>
			</div>
			<div style="margin: 10px; font-size: 28px; font-weight: bold; text-align: center;">条码生成</div>
			<el-form :model="initMainData" label-width="80px">
			<el-row>
			<el-col :span="6">
			<el-col :span="6">
			<el-form-item label="日期">
			<el-date-picker v-model="initMainData.HDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd" style="width: 100%"> </el-date-picker>
			</el-form-item>
			@@ -82,7 +83,7 @@
			</el-form-item>
			</el-col>
			<el-col :span="6">
			<el-form-item label="标准包装数">
			<el-form-item label="数量/箱">
			<el-input-number v-model="initMainData.HMinQty" @change="onChangeForHMinQty" />
			</el-form-item>
			</el-col>
			@@ -163,7 +164,7 @@
			</el-tab-pane>
			</el-tabs>
			</el-form>


			<!-- 打印弹窗 -->
			<el-dialog title="打印模板选择" :visible.sync="openPrintList" width="800px" append-to-body>
			<PrintList :linterid="rowSel.toString()" :MyMsg="rowSel.toString()" Type="HGy_BarCodeBill"
			@@ -187,7 +188,7 @@
			return {
			baseURL: process.env.VUE_APP_BASE_API, //后端接口访问前缀
			HModName: "Gy_BarCodeBill_JinLong_AutoLogin", //模块名称
			disabledFlag_BarCodeProduce:false, //禁用标记-生成按钮
			disabledFlag_BarCodeProduce:false, //禁用标记-生成按钮 // iframe URL
			rules:{ //表头form 校验

			},
			@@ -224,7 +225,7 @@
			,HSeOrderBillNo:"" //客户订单号
			,HCusModel:"" //产品型号
			,HMTONo:null //计划跟踪号

			,HSourceBillSEQ:0 //源单行号
			,HOrganizationID:0 //组织ID
			,HOrganization:"" //组织名称
			},
			@@ -493,6 +494,7 @@
			, "HQty": this.initMainData.HQty_SourceBill
			, "HMinQty": this.initMainData.HMinQty
			, "HBQty": this.initMainData.HBQty
			, "HSourceBillSEQ":this.initMainData.HSourceBillSEQ
			, "HPackQty": 0
			, "HCoilNO": ""
			, "HFurnaceNO": ""
			@@ -567,6 +569,32 @@
			this.$router.push({ path: "/warehouse/barcodeMaster/Gy_BarCodeBillList_JinLong_AutoLogin" }).catch(() => { });
			},
			//#endregion


			//#region下推生成条码
			async get_BarCodeBillHSEQ() {
			var params = this.get_UrlVars();
			var HSourceInterID = params[params[1]];
			var HSourceEntryID = params[params[2]];
			var res1 = await this.getPushSource_POInStockBillInit1(HSourceInterID,HSourceEntryID);
			var temp = res1.data.data[0];
			var dataArray = [temp];
			var HSEQ
			if (dataArray && dataArray.length > 0 && dataArray[0]) {
			if (dataArray[0].HSEQ == '') {
			HSEQ = 0;
			} else {
			HSEQ = dataArray[0].HSEQ;
			}
			} else {
			HSEQ = 0;
			}
			this.$router.push({
			path: `/warehouse/barcodeMaster/Gy_BarCodeBillList_JinLong_AutoLogin?OperationType=4&HSourceInterID=${HSourceInterID}&HSourceEntryID=${HSourceEntryID}&HSEQ=${HSEQ}`
			}).catch(() => { });
			},

			//#endregion

			//#region 条码列表复选框选择状态变更监听事件
			onSelectionChange_BarCode(selection){
			@@ -602,6 +630,26 @@
			})
			},
			//#endregion
			//#region 根据主内码与子内码获取源单收料通知单数据（合并版）
			async getPushSource_POInStockBillInit1(HSourceInterID, HSourceEntryID) {
			var sql = `SELECT m., s.
			FROM Cg_POInStockBillMain m
			INNER JOIN Cg_POInStockBillSub s ON m.hinterid = s.HInterID
			WHERE 1=1`;
			sql += ` AND m.hinterid = ${HSourceInterID}`;
			sql += ` AND s.HEntryID = ${HSourceEntryID}`;
			var ModRightNameCheck = "";
			return axios.get(this.$baseUrl + '/CommonModel/searchMethod', {
			params: {
			"sql": sql,
			"user": sessionStorage["HUserName"],
			"ModRightNameCheck": ModRightNameCheck
			},
			})
			},
			//#endregion

			//#endregion

			//#region 下推页面初始化
			async setInit_PushBill(HSourceInterID,HSourceEntryID) {
			@@ -615,20 +663,26 @@

			//获取源单信息
			var temp = null;
			var res = "none"
			var res = "none"
			var res1 = "none"
			try{
			res = await this.getPushSource_POInStockBillInit(HSourceInterID, HSourceEntryID);
			if(res.data.code=="1"){
			if(res.data.data.length>0){
			res = await this.getPushSource_POInStockBillInit(HSourceInterID, HSourceEntryID);
			}else{
			res = "none";
			this.$modal.msgError("未查询到当前单据！！！");
			res1 = await this.getPushSource_POInStockBillInit1(HSourceInterID,HSourceEntryID);
			if(res1.data.data.length<=0){
			this.$modal.msgError("当前单据未同步，请返回金蝶云SRM平台送货单列表找到该单据在查看页面点击【传递WMS】按钮！！");
			}else{
			res = await this.getPushSource_POInStockBillInit(HSourceInterID, HSourceEntryID);
			if(res.data.code=="1"){
			if(res.data.data.length>0){
			res = await this.getPushSource_POInStockBillInit(HSourceInterID, HSourceEntryID);
			}else{
			res = "none";
			this.$modal.msgError("单据已经全部下推，如果想继续下推，去条码档案作废对应条码");
			}
			}
			}
			else{
			res = "none";
			this.$modal.msgError(res.data.Message);
			else{
			res = "none";
			this.$modal.msgError(res.data.Message);
			}
			}
			}catch(error){
			res = "none";
			@@ -671,6 +725,7 @@
			this.initMainData.HSeOrderBillNo = dataArray[0].客户订单号;
			this.initMainData.HCusModel = dataArray[0].产品型号;
			this.initMainData.HMTONo = dataArray[0].计划跟踪号;
			this.initMainData.HSourceBillSEQ =dataArray[0].源单行号;
			this.initMainData.HMinQty = 0;
			if(this.initMainData.HMinQty>0){
			this.initMainData.HBQty = (this.initMainData.HQty_SourceBill / this.initMainData.HMinQty) + (this.initMainData.HQty_SourceBill%this.initMainData.HMinQty == 0?0:1);