MES-WEB-VUEUI.git

			@@ -83,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>
			@@ -164,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"
			@@ -188,7 +188,7 @@
			return {
			baseURL: process.env.VUE_APP_BASE_API, //后端接口访问前缀
			HModName: "Gy_BarCodeBill_JinLong", //模块名称
			disabledFlag_BarCodeProduce:false, //禁用标记-生成按钮
			disabledFlag_BarCodeProduce:false, //禁用标记-生成按钮 // iframe URL
			rules:{ //表头form 校验

			},
			@@ -321,26 +321,22 @@
			}
			},
			//#endregion

			//#region 条码行号查询按钮点击事件
			//#region下推生成条码
			async get_BarCodeBillHSEQ() {
			var params = this.get_UrlVars();
			var HSourceInterID = params[params[1]];
			var HSourceEntryID = params[params[2]];
			var res2 = await this.getPushSource_POInStockBillInit1(HSourceInterID);
			var res1 = await this.getPushSource_POInStockBillInit2(HSourceEntryID);
			var temp = res1.data.data[0];
			var dataArray = [temp];
			var temp1 = res2.data.data[0];
			var dataArray1 = [temp1];
			sessionStorage["HAutoLogin"] = "2";
			sessionStorage["HMainSourceBillNo"] = dataArray1[0].HBillNo;
			sessionStorage["HSourceBillSEQ"] = dataArray[0].HSEQ;
			this.$router.push({
			path: "/warehouse/barcodeMaster/Gy_BarCodeBillList_JinLong_AutoLogin"
			}).catch(() => { });
			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 = dataArray[0].HSEQ;
			this.$router.push({
			path: `/warehouse/barcodeMaster/Gy_BarCodeBillList_JinLong_AutoLogin?OperationType=4&HSourceInterID=${HSourceInterID}&HSourceEntryID=${HSourceEntryID}&HSEQ=${HSEQ}`
			}).catch(() => { });

			},
			//#endregion

			//#endregion
			//#region 获取组织下拉列表数据
			async get_OrganizationList() {
			axios.get(this.$baseUrl + '/Web/GetOrganizations',{async:false}).then(response => {
			@@ -617,32 +613,21 @@
			})
			},
			//#endregion
			//#region 根据表的主表内码查询表中数据
			async getPushSource_POInStockBillInit1(HSourceInterID) {
			var res = "none";
			var sql = "select * from Cg_POInStockBillMain where 1=1 and hinterid = " + HSourceInterID ;

			//#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', {
			async:false,
			params: {
			"sql": sql
			, "user": sessionStorage["HUserName"]
			, "ModRightNameCheck": ModRightNameCheck
			},
			})
			},
			//#endregion
			//#region 根据主内码与子内码获取源单收料通知单数据
			async getPushSource_POInStockBillInit2(HSourceEntryID) {
			var res = "none";
			var sql = "select * from Cg_POInStockBillSub where 1=1 and HEntryID = " + HSourceEntryID;
			var ModRightNameCheck = "";
			return axios.get(this.$baseUrl + '/CommonModel/searchMethod', {
			async:false,
			params: {
			"sql": sql
			, "user": sessionStorage["HUserName"]
			, "ModRightNameCheck": ModRightNameCheck
			"sql": sql,
			"user": sessionStorage["HUserName"],
			"ModRightNameCheck": ModRightNameCheck
			},
			})
			},
			@@ -662,21 +647,14 @@
			var res = "none"
			try{
			res = await this.getPushSource_POInStockBillInit(HSourceInterID, HSourceEntryID);
			var res2 = await this.getPushSource_POInStockBillInit1(HSourceInterID);
			var temp1 = res2.data.data[0];
			var dataArray1 = [temp1];
			if(res.data.code=="1"){
			if(dataArray1[0].HBillStatus!=2){
			res = "none";
			this.$modal.msgError("单据未审核，请审核");
			res = await this.getPushSource_POInStockBillInit(HSourceInterID, HSourceEntryID);
			if(res.data.data.length>0){
			res = await this.getPushSource_POInStockBillInit(HSourceInterID, HSourceEntryID);
			}else{
			if(res.data.data.length>0){
			res = await this.getPushSource_POInStockBillInit(HSourceInterID, HSourceEntryID);
			}else{
			res = "none";
			this.$modal.msgError("单据已经全部下推，如果想继续下推，去条码档案作废对应条码");
			}
			}
			res = "none";
			this.$modal.msgError("单据已经全部下推，如果想继续下推，去条码档案作废对应条码");
			}
			}
			else{
			res = "none";