From 723793a0aa8d69cbbb463830a3344dbd6655cee5 Mon Sep 17 00:00:00 2001
From: chenhaozhe <gaozhechen26@gmail.com>
Date: 星期六, 04 四月 2026 14:57:02 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong.vue | 56 +++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 47 insertions(+), 9 deletions(-)
diff --git a/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong.vue b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong.vue
index d592867..64df014 100644
--- a/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong.vue
+++ b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong.vue
@@ -3,6 +3,7 @@
<div style=" margin-bottom: 10px; border-bottom: 1px solid #f6f6f6;">
<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_BarCodeBillHSEQ">鏉＄爜琛屽彿鏌ヨ</el-button>
<!-- <el-button type="primary" @click="close">閫� 鍑�</el-button> -->
</div>
<div style="margin: 10px; font-size: 28px; font-weight: bold; text-align: center;">鏉＄爜鐢熸垚</div>
@@ -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", //妯″潡鍚嶇О
- disabledFlag_BarCodeProduce:false, //绂佺敤鏍囪-鐢熸垚 鎸夐挳
+ disabledFlag_BarCodeProduce:false, //绂佺敤鏍囪-鐢熸垚 鎸夐挳 // iframe URL
rules:{ //琛ㄥごform 鏍￠獙
},
@@ -224,7 +225,7 @@
,HSeOrderBillNo:"" //瀹㈡埛璁㈠崟鍙�
,HCusModel:"" //浜у搧鍨嬪彿
,HMTONo:null //璁″垝璺熻釜鍙�
-
+ ,HSourceBillSEQ:0 //婧愬崟琛屽彿
,HOrganizationID:0 //缁勭粐ID
,HOrganization:"" //缁勭粐鍚嶇О
},
@@ -320,7 +321,22 @@
}
},
//#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 = dataArray[0].HSEQ;
+ this.$router.push({
+ path: `/warehouse/barcodeMaster/Gy_BarCodeBillList_JinLong_AutoLogin?OperationType=4&HSourceInterID=${HSourceInterID}&HSourceEntryID=${HSourceEntryID}&HSEQ=${HSEQ}`
+ }).catch(() => { });
+
+ },
+ //#endregion
//#region 鑾峰彇缁勭粐涓嬫媺鍒楄〃鏁版嵁
async get_OrganizationList() {
axios.get(this.$baseUrl + '/Web/GetOrganizations',{async:false}).then(response => {
@@ -468,6 +484,7 @@
this.$modal.msgError("鏉＄爜鐢熸垚鏁伴噺澶т簬鏈�澶у彲鐢熸垚鏁伴噺銆�" + ((dataArray[0].鏁伴噺 * 1) - (dataArray[0].宸茬敓鎴愭潯鐮佹暟閲� * 1)) + "銆�!!");
return false;
}
+
var sMainData_temp = [
{
@@ -492,6 +509,7 @@
, "HQty": this.initMainData.HQty_SourceBill
, "HMinQty": this.initMainData.HMinQty
, "HBQty": this.initMainData.HBQty
+ , "HSourceBillSEQ":this.initMainData.HSourceBillSEQ
, "HPackQty": 0
, "HCoilNO": ""
, "HFurnaceNO": ""
@@ -595,7 +613,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
+
//#region 涓嬫帹椤甸潰鍒濆鍖�
async setInit_PushBill(HSourceInterID,HSourceEntryID) {
//鑾峰彇鍙傛暟
@@ -605,19 +642,19 @@
var HSourceEntryID = params[params[2]]; //婧愬崟瀛恑d
var HSourceBillType = params[params[3]]; //婧愬崟绫诲瀷
var HSourceBillNo = params[params[4]]; //婧愬崟鍗曞彿
-
//鑾峰彇婧愬崟淇℃伅
var temp = null;
var res = "none"
try{
res = await this.getPushSource_POInStockBillInit(HSourceInterID, HSourceEntryID);
if(res.data.code=="1"){
+ res = await this.getPushSource_POInStockBillInit(HSourceInterID, HSourceEntryID);
if(res.data.data.length>0){
res = await this.getPushSource_POInStockBillInit(HSourceInterID, HSourceEntryID);
}else{
res = "none";
- this.$modal.msgError("鏈煡璇㈠埌褰撳墠鍗曟嵁锛侊紒锛�");
- }
+ this.$modal.msgError("鍗曟嵁宸茬粡鍏ㄩ儴涓嬫帹锛屽鏋滄兂缁х画涓嬫帹锛屽幓鏉＄爜妗ｆ浣滃簾瀵瑰簲鏉＄爜");
+ }
}
else{
res = "none";
@@ -639,7 +676,7 @@
this.initMainData.HDate = moment().format('YYYY-MM-DD');
this.initMainData.HMainSourceInterID = HSourceInterID;
this.initMainData.HMainSourceEntryID = HSourceEntryID;
- this.initMainData.HMainSourceBillNo = HSourceBillNo;
+ this.initMainData.HMainSourceBillNo = dataArray[0].鍗曟嵁鍙�;
this.initMainData.HMainSourceBillType = HSourceBillType;
this.initMainData.HPOOrderBillNo = dataArray[0].婧愬崟鍗曞彿==null?"":dataArray[0].婧愬崟鍗曞彿;
this.initMainData.HMaterID = dataArray[0].HMaterID==null?0:dataArray[0].HMaterID;
@@ -664,6 +701,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);
--
Gitblit v1.9.1