From 2bb3673239583ad491a6247de834ef80c079f5bb Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 18 十月 2023 13:35:20 +0800
Subject: [PATCH] 凯贝生成送货单
---
WebAPI/Controllers/BarCodeController.cs | 89 ++++++++++++++++++++++++++++++++++++--------
1 files changed, 73 insertions(+), 16 deletions(-)
diff --git a/WebAPI/Controllers/BarCodeController.cs b/WebAPI/Controllers/BarCodeController.cs
index 48470e2..ae04a00 100644
--- a/WebAPI/Controllers/BarCodeController.cs
+++ b/WebAPI/Controllers/BarCodeController.cs
@@ -13,6 +13,8 @@
using System.Web.Script.Serialization;
using WebAPI.Code;
using WebAPI.Models;
+using WebAPI.Utility;
+
namespace WebAPI.Controllers
{
@@ -626,6 +628,8 @@
bar.HSupID = oItemSub.HSupID;
bar.HEndQty = WeiShu;
bar.HMTONO = oItemSub.HMTONO;
+ bar.HSupBatchNo = oItemSub.HSupBatchNo;
+ bar.HSupMaterNumber = oItemSub.HSupMaterNumber;
ls2.Add(bar);
}
}
@@ -706,6 +710,8 @@
bar2.HSupID = oItemSub2.HSupID;
bar2.HEndQty = WeiShu1;
bar2.HMTONO = oItemSub2.HMTONO;
+ bar2.HSupBatchNo = DBUtility.ClsPub.isStrNull(oItemSub2.HSupBatchNo);
+ bar2.HSupMaterNumber = DBUtility.ClsPub.isStrNull(oItemSub2.HSupMaterNumber);
ls3.Add(bar2);
//LogService.Write("娴嬭瘯鍔�+++" + oItemSub2.HSupID);
}
@@ -730,6 +736,8 @@
string HKFDQDate = "";
string HWei = "";
string HMTONO = "";
+ string HSupBatchNo = "";
+ string HSupMaterNumber = "";
oCn.BeginTran();
foreach (Model.ClsGy_MaterialList_WMS_Model oItemSub in ls)
{
@@ -758,6 +766,8 @@
HSourceBillNo = ClsPub.isStrNull(oItemSub.HSourceBillNo);
HSourceBillType = ClsPub.isStrNull(oItemSub.HSourceBillType);
HWei = ClsPub.isStrNull(oItemSub.HEndQty);
+ HSupBatchNo = ClsPub.isStrNull(oItemSub.HSupBatchNo);
+ HSupMaterNumber = ClsPub.isStrNull(oItemSub.HSupMaterNumber);
if (FCusName.Contains("澶忓疂"))
{
HBarCode = $"{oItemSub.HMaterID}";
@@ -765,11 +775,12 @@
}
string sql = "insert into Gy_BarCodeBill (HInterID,HBarCode,HBarCodeType,HMaterID,HUnitID,HQty,HKFDate,HKFPeriod,HKFDQDate" +
",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HEndQty,HSupflag" +
- ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HMTONO " +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HMTONO,HSupBatchNo,HSupMaterNumber " +
") values ("
+ linterid.ToString() + ",'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID + "," + HUnitID + "," + HQty2 + ",'" + HKFDate + "'," + HKFPeriod + ",'" + HKFDQDate
+ "','" + HBatchNo + "'," + HSupID + "," + HGroupID + ",'" + ClsPub.CurUserName + "','" + DateTime.Today + "'," + HPrintQty + ",'" + HWei + "',1"
- + "," + HSourceInterID + "," + HSourceEntryID + ",'" + HSourceBillNo + "','" + HSourceBillType + "','" + HMTONO + "')";
+ + "," + HSourceInterID + "," + HSourceEntryID + ",'" + HSourceBillNo + "','" + HSourceBillType + "','" + HMTONO + "','" + HSupBatchNo+ "','" + HSupMaterNumber + "'" +
+ ")";
oCn.RunProc(sql);
//LogService.Write(sql);
sql = "exec setLSH '" + DateTime.Today + "'";
@@ -798,6 +809,8 @@
HSourceBillNo = ClsPub.isStrNull(oItemSub.HSourceBillNo);
HSourceBillType = ClsPub.isStrNull(oItemSub.HSourceBillType);
HWei = ClsPub.isStrNull(oItemSub.HEndQty);
+ HSupBatchNo = ClsPub.isStrNull(oItemSub.HSupBatchNo);
+ HSupMaterNumber = ClsPub.isStrNull(oItemSub.HSupMaterNumber);
if (FCusName.Contains("澶忓疂"))
{
HBarCode = $"{oItemSub.HMaterID}";
@@ -805,11 +818,12 @@
}
string sql = "insert into Gy_BarCodeBill (HInterID,HBarCode,HBarCodeType,HMaterID,HUnitID,HQty,HKFDate,HKFPeriod,HKFDQDate" +
",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HEndQty,HSupflag" +
- ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HMTONO " +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HMTONO ,HSupBatchNo,HSupMaterNumber" +
") values ("
+ linterid.ToString() + ",'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID + "," + HUnitID + "," + HQty2 + ",'" + HKFDate + "'," + HKFPeriod + ",'" + HKFDQDate
+ "','" + HBatchNo + "'," + HSupID + "," + HGroupID + ",'" + ClsPub.CurUserName + "','" + DateTime.Today + "'," + HPrintQty + ",'" + HWei + "',1"
- + "," + HSourceInterID + "," + HSourceEntryID + ",'" + HSourceBillNo + "','" + HSourceBillType + "','" + HMTONO + "')";
+ + "," + HSourceInterID + "," + HSourceEntryID + ",'" + HSourceBillNo + "','" + HSourceBillType + "','" + HMTONO + "','" +
+ HSupBatchNo + "','" + HSupMaterNumber + "'" + ")";
oCn.RunProc(sql);
//LogService.Write(sql);
}
@@ -1456,15 +1470,12 @@
/// <summary>
/// 鏉＄爜鐢熸垚琛ㄤ綋锛堥噰璐鍗曪級
/// </summary>
- /// <param name="sMsg"></param>
+ /// <param name="sMsg">閲囪喘璁㈠崟HinterID</param>
/// <returns></returns>
public object GetHBarCodeShowBillSubBycg(string sMsg)
{
try
{
- DataSet ds;
- string s = "";
- string ShowItem = " * ";//鏄剧ず鐨勫瓧娈�
if (DBUtility.ClsPub.isLong(sMsg) == 0)
{
objjson.code = "0";
@@ -1473,9 +1484,18 @@
objjson.data = null;
return objjson;
}
+ //棰勫鐞� 淇敼閲囪喘璁㈠崟鐨勯��鏂欐暟閲�
+ var kdTbaleName = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "DataBaseName");
+ string sql = $@"update t1 set
+ t1.HMrbQty = t2.FMRBQTY
+ from Cg_POOrderBillSub t1
+ join {kdTbaleName}..T_PUR_POORDERENTRY_R t2
+ on t1.HEntryID = t2.FENTRYID
+ where t1.HInterID = {sMsg} ";//sMsg 閲囪喘璁㈠崟hinterid
+ oCn.RunProc(sql);
DAL.ClsWeb_BarCodeBill oClsWeb_BarCodeBill = new DAL.ClsWeb_BarCodeBill();
- string sql = string.Format(@"select * from h_v_Cg_POOrderBillSub_ForWeb2 where HInterID = " + sMsg);
- ds = oCn.RunProcReturn(sql, "h_v_Cg_POOrderBillSub_ForWeb2");
+ sql = string.Format(@"select * from h_v_Cg_POOrderBillSub_ForWeb2 where HInterID = " + sMsg);
+ DataSet ds = oCn.RunProcReturn(sql, "h_v_Cg_POOrderBillSub_ForWeb2");
//ds = oClsWeb_BarCodeBill.ShowBillSub(DBUtility.ClsPub.isLong(sMsg), ShowItem, ref DBUtility.ClsPub.sExeReturnInfo);
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
@@ -1518,8 +1538,8 @@
var _value = msg["msg"].ToString();
string msg1 = _value.ToString();
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
- string msg2 = sArray[0].ToString();
- string msg3 = sArray[1].ToString();
+ string msg2 = sArray[0].ToString();//
+ string msg3 = sArray[1].ToString();//
string UserName = "";
ListModels oListModels = new ListModels();
try
@@ -1539,6 +1559,7 @@
List<Model.ClsGy_MaterialList_WMS_Model> ls = new List<Model.ClsGy_MaterialList_WMS_Model>();
List<Model.ClsGy_BarCodeBill_WMS_Model> ls2 = new List<Model.ClsGy_BarCodeBill_WMS_Model>();//澶栫model
List<Model.ClsGy_BarCodeBill_WMS_Model> ls3 = new List<Model.ClsGy_BarCodeBill_WMS_Model>();//鍐呯model
+
ls = oListModels.getObjectByJson_MaterialList(msg3);//鍒楄〃鏁版嵁model
long linterid = Pub_Class.ClsPub.CreateBillID_SRMProd("8888", ref DBUtility.ClsPub.sExeReturnInfo);
@@ -1559,6 +1580,7 @@
string WeiShu = ""; //灏炬暟
DataSet Ds;
SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
+ oCn.BeginTran();
Ds = oCn.RunProcReturn("exec GetLSH '" + DateTime.Today + "'", "GetLSH");
LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
foreach (Model.ClsGy_MaterialList_WMS_Model oItemSub in ls)
@@ -1567,9 +1589,10 @@
if (oItemSub.HQty == 0 || oItemSub.HMinQty == 0 || oItemSub.HWXQty == 0)
continue;
//妫�楠屾墦鍗版暟閲忥紙HQTY锛夊拰鏈墦鍗版暟閲�
- string sql = $"select HQty -HBarcodeCount as HNotBarcodeCount ,* from Cg_POOrderBillSub where HEntryID = {oItemSub.HSourceEntryID}";
+ string sql = $"select HQty + isnull(HMrbQty,0) - HBarcodeCount as HNotBarcodeCount ,* from Cg_POOrderBillSub where HEntryID = {oItemSub.HSourceEntryID}";
DataSet ds = oCn.RunProcReturn(sql, "tables");
- if (ds.Tables[0].Rows.Count > 0 && Convert.ToInt32(ds.Tables[0].Rows[0][0]) < oItemSub.HQty)
+
+ if (ds.Tables[0].Rows.Count > 0 && Convert.ToDouble(ds.Tables[0].Rows[0][0]) < oItemSub.HQty)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -1633,6 +1656,32 @@
TM = $"{oItemSub.HMaterNumber}@{oItemSub.HMaterName}@{oItemSub.HMaterModel}@{oItemSub.HKFDate}@{HMinQty}@{oItemSub.HKFDQDate}@{oItemSub.HBatchNo.TrimStart().TrimEnd()}@{oItemSub.HSupName}@{oItemSub.HSourceBillNo}";
Model.ClsGy_BarCodeBill_WMS_Model bar = new Model.ClsGy_BarCodeBill_WMS_Model();
+ var HBarCode_verify = TM.Split('@'); //鏍￠獙鏉＄爜淇℃伅
+ var HMaterNumber_verify = HBarCode_verify[0]; //鏍￠獙鐗╂枡缂栫爜
+ var HMaterName_verify = HBarCode_verify[1]; //鏍￠獙鐗╂枡鍚嶇О
+ var HMaterModel_verify = HBarCode_verify[2]; //鏍￠獙瑙勬牸鍨嬪彿
+ var HSupName_verify = HBarCode_verify[7]; //鏍￠獙渚涘簲鍟�
+ var HSourceBillNo_verify = HBarCode_verify[8]; //鏍￠獙閲囪喘璁㈠崟鍙�
+
+ sql = $"select * from Gy_Material where HNumber = '{HMaterNumber_verify}' and HName = '{HMaterName_verify}'";
+ DataSet verifyMatInfo = oCn.RunProcReturn(sql, "tables");
+
+ sql = $"select * from Cg_POOrderBillMain where HBillNo = '{HSourceBillNo_verify}'";
+ DataSet verifyBillInfo = oCn.RunProcReturn(sql, "tables");
+
+ sql = $"select * from Gy_Supplier where HName = '{HSupName_verify}'";
+ DataSet verifySupInfo = oCn.RunProcReturn(sql, "tables");
+
+ if (verifyMatInfo.Tables[0].Rows.Count <= 0 || verifyBillInfo.Tables[0].Rows.Count <= 0 || verifySupInfo.Tables[0].Rows.Count <= 0)
+ {
+ oCn.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = $"鏉＄爜淇℃伅鏍￠獙鍑洪敊锛岃閲嶆柊鐢熸垚鏉＄爜";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
bar.HBarCode = TM;
bar.HMaterID = oItemSub.HMaterID;
//bar.HMaterNumber = oItemSub.HMaterNumber;
@@ -1659,6 +1708,7 @@
}
}
}
+ oCn.Commit();
foreach (Model.ClsGy_BarCodeBill_WMS_Model oItemSub2 in ls2)
{
if (ClsPub.isLong(oItemSub2.HMaterID) != 0)
@@ -2000,12 +2050,19 @@
}
[Route("DeltetBarCodeBill")]
- [HttpGet]
- public object DeltetBarCodeBill(string HInterID, string HUserName)
+ [HttpPost]
+ public object DeltetBarCodeBill([FromBody] JObject oData)
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
try
{
+ var _value = oData["oData"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string HInter = sArray[0].ToString();
+ string HInterID = HInter.Replace("\"", "");
+ string HUserName = sArray[1].ToString();
+
string FCusName = oSystemParameter.GetSingleSystemParameter("WMS_CampanyName", ref DBUtility.ClsPub.sExeReturnInfo);
string sql = "select HItemID,HBarCode,HSourceInterID,HSourceEntryID,HQty,HBarCodeType,HSourceBillType from Gy_BarCodeBill where HItemID in(" + HInterID + ") ";
//LogService.Write("鍒犻櫎sql:" + sql);
--
Gitblit v1.9.1