From d55d93edc8ad2f06ec371fdf7098700919298ce3 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 19 五月 2023 13:57:15 +0800
Subject: [PATCH] 网页版 条码生成模块： 增加 生产入库、采购入库、销售退货、生产退料、批次调整单 为源单，生成条码， 并 自动产生对应 条码出入库记录 功能；(外网版条码生成已有此功能，自动生成条码出入库记录调相同方法即可)
---
WebAPI/Controllers/CJGL/Cj_StationInBillController.cs | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
index 5bc4ed7..83b1ba4 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
@@ -124,6 +124,7 @@
long HCenterID = list[0].HCenterID;//宸ヤ綔涓績ID
string HOrderProcNO = list[0].HOrderProcNO;//璁㈠崟璺熻釜鍙�
long HPRDOrgID = list[0].HPRDOrgID;//缁勭粐ID
+ double HmaterOutqty = list[0].HmaterOutqty;//鐧藉澂鍙戝竷
//鍗曟嵁瀹屾暣鎬у垽鏂�
if (HMaterID <= 0)
{
@@ -191,6 +192,7 @@
",HGroupID,HDeptID,HEmpID,HBarCode,HAddr,HBarCodeMaker,HBarCodeMakeDate" +
",HSupID,HQty,HPrice,HMoney,HPieceQty,HSourceName,HCenterID" +
",HProcNo,HOrderProcNO,HMainInterID,HPRDOrgID" +
+ ",HmaterOutqty" +
") " +
" values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",getdate(),'" + HMaker + "',getdate()" +
"," + HYear + "," + HPeriod + ",'" + HRemark + "'" +
@@ -199,7 +201,7 @@
"," + HGroupID + "," + HDeptID + "," + HEmpID + ",'" + HBarCode + "','" + HAddr + "','" + HBarCodeMaker + "',getdate()" +
"," + HSupID + "," + HQty + "," + HPrice + "," + HMoney + "," + HPieceQty + ",'" + HSourceName + "'," + HCenterID +
",'" + HProcNo + "','" + HOrderProcNO + "','" + HMainInterID + "'," + HPRDOrgID +
- ") ");
+ ","+ HmaterOutqty + ") ");
}
else if ("Modify".Equals(eventType))
{
@@ -227,6 +229,7 @@
",HProcExchBillNo='" + HProcExchBillNo + "'" +
",HMaterID=" + HMaterID +
",HProcID=" + HProcID +
+ ",HmaterOutqty=" + HmaterOutqty +
",HICMOQty=" + HICMOQty +
",HPlanQty=" + HPlanQty +
",HStationInTime=getdate()" +
@@ -396,7 +399,7 @@
}
//寰楀埌淇℃伅锛堝澶栨爣璁颁负0鏃讹紝娴佽浆鏍囪涓�1鏃讹級
- ds = oCN.RunProcReturn("select top 2 * from h_v_Sc_ProcessExchangeBillList where 鍗曟嵁鍙�= '" + sBillNo + "' and 涓嬮亾娴佽浆宸ュ簭<>'杞�' and 濮斿鏍囪=0 and 娴佽浆鏍囪=1 and 宸ュ簭鍙�<='" + sProcNo + "' order by cast(宸ュ簭鍙� as int) desc", "h_v_Sc_ProcessExchangeBillList");
+ ds = oCN.RunProcReturn("select top 2 * from h_v_Sc_ProcessExchangeBillList where 鍗曟嵁鍙�= '" + sBillNo + "' and 涓嬮亾娴佽浆宸ュ簭<>'杞�' and 濮斿鏍囪=0 and 娴佽浆鏍囪=1 and cast(宸ュ簭鍙� as int)<='" + sProcNo + "' order by cast(宸ュ簭鍙� as int) desc", "h_v_Sc_ProcessExchangeBillList");
//Ds = oCn.RunProcReturn("select top 1 * from h_v_Sc_ProcessExchangeBillList where 鍗曟嵁鍙�= '" + sBillNo + "' and 宸ュ簭鍙�='" + sProcNo + "' and 濮斿鏍囪=0 and 娴佽浆鏍囪=1 ", "h_v_Sc_ProcessExchangeBillList");
//鍐欏叆淇℃伅
if (ds == null || ds.Tables[0].Rows.Count == 0)
@@ -974,14 +977,22 @@
DAL.ClsSc_StationInBill oBill = new DAL.ClsSc_StationInBill();
if (oBill.ShowBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo))
{
- if (oBill.omodel.HMaker != HDeleteMan && (HDeleteMan != "admin" && HDeleteMan != "Admin"))
+ string sReturn = "";
+ if (oSystemParameter.ShowBill(ref sReturn))
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鍙兘鍒犻櫎鏈汉鐨勫崟鎹紒";
- objJsonResult.data = null;
- return objJsonResult;
+ if (oSystemParameter.omodel.MES_StationInBill_DeleteCtl == "Y")
+ {
+ if (oBill.omodel.HMaker != HDeleteMan && (HDeleteMan != "admin" && HDeleteMan != "Admin"))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙兘鍒犻櫎鏈汉鐨勫崟鎹紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
}
+
SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
DataSet ds;
--
Gitblit v1.9.1