From ccc2ee8fea3caafe9e5ccd6eb1a369d42279dbf9 Mon Sep 17 00:00:00 2001
From: wangyi <2946747746@qq.com>
Date: 星期三, 11 三月 2026 12:39:09 +0800
Subject: [PATCH] 1.存储源单行号。 2.下推条码时，区分单据是没有同步 3.金蝶云跳转的条码生成页面，增加按钮 查看本单生成条码，跳转到条码档案。
---
src/views/warehouse/barcodeMaster/Gy_BarCodeBillList.vue | 7 ++
src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong.vue | 76 ++++++++++++++++++++++--
src/views/scMould/warehouse/Sc_MouldInRequestBillList.vue | 2
src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue | 6 +-
src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong_AutoLogin.vue | 86 ++++++++++++++++++++++++----
5 files changed, 150 insertions(+), 27 deletions(-)
diff --git a/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue
index f5fa7b7..35bdaac 100644
--- a/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue
@@ -175,7 +175,7 @@
<el-tabs v-model="activeName1" type="border-card">
<el-tab-pane label="鏄庣粏淇℃伅" name="first">
- <div style="margin-bottom: 10px;">
+ <div style="margin-bottom: 10px;">get_ContainerInstantStock
<el-button type="success" plain icon="el-icon-plus" @click="handleAddSysZb()" size="mini">澧炲姞涓�琛�</el-button>
<el-button type="success" plain icon="el-icon-plus" @click="handleAddSysZb(zbIndex, 1)"
size="mini">鎻掑叆涓�琛�</el-button>
@@ -184,8 +184,8 @@
size="mini">涓婄Щ</el-button>
<el-button type="success" plain icon="el-icon-arrow-down" @click="handleMoveRowDown(zbSelForm)"
size="mini">涓嬬Щ</el-button>
- <el-button type="success" plain icon="el-icon-printer" @click="get_ICInventoryMould(zbSelForm)">瀹瑰櫒搴撳瓨</el-button>
- <el-button type="success" plain icon="el-icon-printer" @click="get_ContainerInstantStock(zbSelForm)">瀹瑰櫒鍗虫椂搴撳瓨</el-button>
+ <el-button type="success" plain icon="el-icon-printer" @click="get_ICInvget_ContainerInstantStockentoryMould(zbSelForm)">瀹瑰櫒搴撳瓨</el-button>
+ <el-button type="success" plain icon="el-icon-printer" @click="(zbSelForm)">瀹瑰櫒鍗虫椂搴撳瓨</el-button>
</div>
<el-table :data="editData" style="width: 100%" height="300" width="100%" ref="zbTable"
@selection-change="handleTableZbEdit" :row-class-name="rowSysZbIndex" show-summary border>
diff --git a/src/views/scMould/warehouse/Sc_MouldInRequestBillList.vue b/src/views/scMould/warehouse/Sc_MouldInRequestBillList.vue
index 80f1f05..8b7969c 100644
--- a/src/views/scMould/warehouse/Sc_MouldInRequestBillList.vue
+++ b/src/views/scMould/warehouse/Sc_MouldInRequestBillList.vue
@@ -340,7 +340,7 @@
created() {
// this.fetchData()
if(this.openPage && this.HOrgID){
- this.queryParams.HStockOrgID = this.HOrgID
+ this.queryParams.HStockOrgID = this.HOrgID
}
this.riqiChange()
this.getList();
diff --git a/src/views/warehouse/barcodeMaster/Gy_BarCodeBillList.vue b/src/views/warehouse/barcodeMaster/Gy_BarCodeBillList.vue
index 524f878..8e43f3d 100644
--- a/src/views/warehouse/barcodeMaster/Gy_BarCodeBillList.vue
+++ b/src/views/warehouse/barcodeMaster/Gy_BarCodeBillList.vue
@@ -490,7 +490,12 @@
if (this.queryParams.HOrgID) {
this.sWhere += " and HStockOrgID = ''" + this.queryParams.HOrgID + "''";
}
-
+ if(sessionStorage["HMainSourceBillNo"] &&sessionStorage["HMainSourceBillNo"].length>0){
+ this.sWhere += " and 婧愬崟鍗曞彿 like ''%" + sessionStorage["HMainSourceBillNo"] + "%''";
+ }
+ if (sessionStorage["HSourceBillSEQ"] &&sessionStorage["HSourceBillSEQ"].length>0) {
+ this.sWhere += " and 婧愬崟琛屽彿 = ''" + sessionStorage["HSourceBillSEQ"] + "''";
+ }
//濡傛灉鏄嚜鍔ㄧ櫥褰曪紝鍒欏彧鑳芥煡鐪嬩緵搴斿晢鑷繁鐨勬潯鐮併��
if (sessionStorage["HAutoLogin"] == "1") {
this.sWhere += " and HSupID = ''" + sessionStorage["HUserName"] + "''";
diff --git a/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong.vue b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong.vue
index d592867..bf76aab 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>
@@ -224,7 +225,7 @@
,HSeOrderBillNo:"" //瀹㈡埛璁㈠崟鍙�
,HCusModel:"" //浜у搧鍨嬪彿
,HMTONo:null //璁″垝璺熻釜鍙�
-
+ ,HSourceBillSEQ:0 //婧愬崟琛屽彿
,HOrganizationID:0 //缁勭粐ID
,HOrganization:"" //缁勭粐鍚嶇О
},
@@ -321,6 +322,25 @@
},
//#endregion
+ //#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(() => { });
+ },
+ //#endregion
//#region 鑾峰彇缁勭粐涓嬫媺鍒楄〃鏁版嵁
async get_OrganizationList() {
axios.get(this.$baseUrl + '/Web/GetOrganizations',{async:false}).then(response => {
@@ -468,6 +488,7 @@
this.$modal.msgError("鏉＄爜鐢熸垚鏁伴噺澶т簬鏈�澶у彲鐢熸垚鏁伴噺銆�" + ((dataArray[0].鏁伴噺 * 1) - (dataArray[0].宸茬敓鎴愭潯鐮佹暟閲� * 1)) + "銆�!!");
return false;
}
+
var sMainData_temp = [
{
@@ -492,6 +513,7 @@
, "HQty": this.initMainData.HQty_SourceBill
, "HMinQty": this.initMainData.HMinQty
, "HBQty": this.initMainData.HBQty
+ , "HSourceBillSEQ":this.initMainData.HSourceBillSEQ
, "HPackQty": 0
, "HCoilNO": ""
, "HFurnaceNO": ""
@@ -595,7 +617,37 @@
})
},
//#endregion
-
+ //#region 鏍规嵁琛ㄧ殑涓昏〃鍐呯爜鏌ヨ琛ㄤ腑鏁版嵁
+ async getPushSource_POInStockBillInit1(HSourceInterID) {
+ var res = "none";
+ var sql = "select * from Cg_POInStockBillMain where 1=1 and hinterid = " + HSourceInterID ;
+ 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
+ },
+ })
+ },
+ //#endregion
+
//#region 涓嬫帹椤甸潰鍒濆鍖�
async setInit_PushBill(HSourceInterID,HSourceEntryID) {
//鑾峰彇鍙傛暟
@@ -605,18 +657,25 @@
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);
+ var res2 = await this.getPushSource_POInStockBillInit1(HSourceInterID);
+ var temp1 = res2.data.data[0];
+ var dataArray1 = [temp1];
if(res.data.code=="1"){
- if(res.data.data.length>0){
- res = await this.getPushSource_POInStockBillInit(HSourceInterID, HSourceEntryID);
+ if(dataArray1[0].HBillStatus!=2){
+ res = "none";
+ this.$modal.msgError("鍗曟嵁鏈鏍革紝璇峰鏍�");
}else{
- res = "none";
- this.$modal.msgError("鏈煡璇㈠埌褰撳墠鍗曟嵁锛侊紒锛�");
+ if(res.data.data.length>0){
+ res = await this.getPushSource_POInStockBillInit(HSourceInterID, HSourceEntryID);
+ }else{
+ res = "none";
+ this.$modal.msgError("鍗曟嵁宸茬粡鍏ㄩ儴涓嬫帹锛屽鏋滄兂缁х画涓嬫帹锛屽幓鏉＄爜妗ｆ浣滃簾瀵瑰簲鏉＄爜");
+ }
}
}
else{
@@ -639,7 +698,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 +723,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);
diff --git a/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong_AutoLogin.vue b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong_AutoLogin.vue
index 587d8a0..bd485d0 100644
--- a/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong_AutoLogin.vue
+++ b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong_AutoLogin.vue
@@ -1,14 +1,15 @@
<template>
<div style="margin: 10px;">
- <div style=" margin-bottom: 10px; border-bottom: 1px solid #f6f6f6;">
+ <div style=" margin-bottom: 10px; border-bottom: 1px solid #f6f6f6;"get_BarCodeBillList>
<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>
@@ -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,25 @@
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 HSourceBillNo = params[params[4]];
+ var res1 = await this.getPushSource_POInStockBillInit2(HSourceEntryID);
+ var temp = res1.data.data[0];
+ var dataArray = [temp];
+ sessionStorage["HAutoLogin"] = "2";
+ sessionStorage["HMainSourceBillNo"] = HSourceBillNo;
+ sessionStorage["HSourceBillSEQ"] = dataArray[0].HSEQ;
+ this.$router.push({
+ path: "/warehouse/barcodeMaster/Gy_BarCodeBillList_JinLong_AutoLogin"
+ }).catch(() => { });
+
+ },
+ //#endregion
//#region 鏉＄爜鍒楄〃澶嶉�夋閫夋嫨鐘舵�佸彉鏇寸洃鍚簨浠�
onSelectionChange_BarCode(selection){
@@ -602,6 +623,36 @@
})
},
//#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
+ },
+ })
+ },
+ //#endregion
+ //#region 鏍规嵁琛ㄧ殑涓昏〃鍐呯爜鏌ヨ琛ㄤ腑鏁版嵁
+ async getPushSource_POInStockBillInit1(HSourceInterID) {
+ var res = "none";
+ var sql = "select * from Cg_POInStockBillMain where 1=1 and hinterid = " + HSourceInterID ;
+ var ModRightNameCheck = "";
+ return axios.get(this.$baseUrl + '/CommonModel/searchMethod', {
+ async:false,
+ params: {
+ "sql": sql
+ , "user": sessionStorage["HUserName"]
+ , "ModRightNameCheck": ModRightNameCheck
+ },
+ })
+ },
+ //#endregion
//#region 涓嬫帹椤甸潰鍒濆鍖�
async setInit_PushBill(HSourceInterID,HSourceEntryID) {
@@ -615,20 +666,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);
+ if(res1.data.data.length<=0){
+ this.$modal.msgError("閲戣澏浜戜腑鐨勬暟鎹湭鍚屾锛岃妫�鏌ユ敹鏂欓�氱煡鍗曟槸鍚﹀鏍�");
+ }else{
+ 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 +728,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