From 81245567c8035a95321fca11c3a3d4bde57714c5 Mon Sep 17 00:00:00 2001
From: 陈婷婷 <506607603@qq.com>
Date: 星期二, 31 三月 2026 14:49:30 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong_AutoLogin.vue | 90 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 72 insertions(+), 18 deletions(-)
diff --git a/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong_AutoLogin.vue b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong_AutoLogin.vue
index 8f75d67..c968a9f 100644
--- a/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong_AutoLogin.vue
+++ b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong_AutoLogin.vue
@@ -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骞冲彴閫佽揣鍗曞垪琛ㄦ壘鍒拌鍗曟嵁鍦ㄦ煡鐪嬮〉闈㈢偣鍑汇�愪紶閫扺MS銆戞寜閽紒锛�");
+ }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);
@@ -726,7 +781,6 @@
var HPwdWord = params[params[6]]; //鐧诲綍瀵嗙爜
var HOrgID = params[params[7]]; //缁勭粐id
var HOrgName = "";
- console.log("HOrgID", HOrgID);
if (HOrgID == 0) {
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
--
Gitblit v1.9.1