From 679fcc729a588e810b42e12409eac3bca7103b5d Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 10 五月 2023 10:42:10 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/基础资料/基础资料/Gy_MaterTypeBillController.cs | 4
WebAPI/Controllers/BaseSet/Gy_ICBomBillController.cs | 1
Model/生产管理/设备管理/ClsSc_ICMOBillMain.cs | 1
WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs | 106 +++++++++++++++++++++++++++++++++++
WebAPI/Controllers/LMESController.cs | 2
Pub_Class/CustomerCls/ClsPub.cs | 20 ++++++
WebAPI/Controllers/BLL/Xt_UserGroupController.cs | 6 +
WebAPI/Controllers/生产管理/生产任务单/Sc_ICMOBillController.cs | 10 ++-
8 files changed, 141 insertions(+), 9 deletions(-)
diff --git "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSc_ICMOBillMain.cs" "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSc_ICMOBillMain.cs"
index 0b1ba82..a7f6768 100644
--- "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSc_ICMOBillMain.cs"
+++ "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSc_ICMOBillMain.cs"
@@ -24,6 +24,7 @@
public Int64 HBomID; // --BOM单ID
public string HBomNumber;
public Int64 HRoutingInterID; // --工艺路线ID
+ public Int64 HOWNERID; // --货主
public DateTime HPlanBeginDate; //计划开工日期
public DateTime HPlanEndDate; //计划完工日期
public DateTime HBeginDate; // --最迟开工日期
diff --git a/Pub_Class/CustomerCls/ClsPub.cs b/Pub_Class/CustomerCls/ClsPub.cs
index e560972..3895337 100644
--- a/Pub_Class/CustomerCls/ClsPub.cs
+++ b/Pub_Class/CustomerCls/ClsPub.cs
@@ -458,6 +458,26 @@
oCn.RunProc("update Gy_Maxnum set NowNumBer=NowNumBer+1 where BillCode='" + BillCode.Trim() + "' and KjYear='" + sKjYear + "' and Period='" + sPeriod + "' and whcode='" + sDay + "'");
}
return sBillNo;
+ case 3: //鏍规嵁 涔斾竴 锛圫 + 骞达紙23锛�+浜斾綅娴佹按鍙凤級瀹炰緥锛歋2300001
+ Ds = oCn.RunProcReturn("Select * from Gy_MaxNum where BillCode='" + BillCode.Trim() + "' and KjYear='0' and whcode=''", "Gy_MaxNum");
+ sKjYear = sKjYear.Substring(2, 2);
+ if (Ds.Tables[0].Rows.Count != 0)
+ {
+ sStr = new string(c, CodeLen - (Ds.Tables[0].Rows[0]["NowNumBer"].ToString()).Length);
+ Profix = Profix.Substring(0, 1);
+ sBillNo = Profix.Trim() + sKjYear + sStr + Ds.Tables[0].Rows[0]["NowNumBer"].ToString().Trim();
+ }
+ else //鎻掑叆鏂拌褰�
+ {
+ sStr = new string(c, CodeLen - 1);
+ oCn.RunProc("insert into Gy_Maxnum(BillCode,Kjyear,Period,whcode,NowNumber) values('" + BillCode.Trim() + "','" + sKjYear + "','" + sPeriod + "','" + sDay + "',1)");
+ sBillNo = Profix.Trim() + sKjYear + sStr + 1;
+ }
+ if (Add == true)
+ {
+ oCn.RunProc("update Gy_Maxnum set NowNumBer=NowNumBer+1 where BillCode='" + BillCode.Trim() + "' and KjYear='0' and whcode=''");
+ }
+ return sBillNo;
default:
return sBillNo;
diff --git a/WebAPI/Controllers/BLL/Xt_UserGroupController.cs b/WebAPI/Controllers/BLL/Xt_UserGroupController.cs
index 64d2d52..28a421d 100644
--- a/WebAPI/Controllers/BLL/Xt_UserGroupController.cs
+++ b/WebAPI/Controllers/BLL/Xt_UserGroupController.cs
@@ -192,8 +192,10 @@
if (ds.Tables[0].Rows.Count > 0)
{
oCN.BeginTran();//寮�鍚簨鍔�
-
- oCN.RunProc($"delete from h_v_System_UserGroup where HGroupID={HInterID}");
+ //鍒犻櫎瑙掕壊琛�
+ oCN.RunProc($"delete from System_UserGroup where GroupID={HInterID}");
+ //鍒犻櫎鍏宠仈鐨勭敤鎴峰叧绯�
+ oCN.RunProc($"delete from System_UserGroupInfo where GroupId={HInterID}");
oCN.Commit();//缁撴潫浜嬪姟
diff --git a/WebAPI/Controllers/BaseSet/Gy_ICBomBillController.cs b/WebAPI/Controllers/BaseSet/Gy_ICBomBillController.cs
index a70b248..8089cf5 100644
--- a/WebAPI/Controllers/BaseSet/Gy_ICBomBillController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_ICBomBillController.cs
@@ -35,6 +35,7 @@
oCN.RunProc(sql);
sql = $"delete Gy_ICBomBillSub where HinterID = {mainList[0].HInterID}";
oCN.RunProc(sql);
+ mainList[0].HBillNo = DBUtility.ClsPub.CreateBillCode("3302", ref DBUtility.ClsPub.sExeReturnInfo,true);
oCN.RunProc("Insert Into Gy_ICBomBillMain " +
"(HBillType,HInterID,HBillNo,HDate" +
",HYear,HPeriod,HRemark,HMaker,HMakeDate,HMaterTypeID,HStatus" +
diff --git a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
index 187c835..f48232e 100644
--- a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
+++ b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
@@ -373,6 +373,112 @@
//}
#endregion
+ #region[鏂板鍗曟嵁-淇濆瓨鎸夐挳-鎵归噺澶嶅埗]
+ /// <summary>
+ /// 鏂板鍗曟嵁-淇濆瓨鎸夐挳
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Sc_ProcessExchangeBill/AddBill_Copy_pl")]
+ [HttpPost]
+ public object AddBill_Copy_pl([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ int msg2 = int.Parse(sArray[0].ToString());
+ string msg3 = sArray[1].ToString();
+ string msg4 = sArray[2].ToString();
+ string msg5 = sArray[3].ToString();
+
+ string UserName = "";
+ ListModels oListModels = new ListModels();
+ string sReturn = "";
+ try
+ {
+ if (!DBUtility.ClsPub.Security_Log("Sc_ProcessExchangeBill_Edit", 1, false, msg4))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ DAL.ClsSc_ProcessExchangeBill oBill = new DAL.ClsSc_ProcessExchangeBill();
+ DBUtility.ClsPub.HOrgID = long.Parse(msg5);
+ DBUtility.ClsPub.CurUserName = msg4;
+ oBill.ShowBill(long.Parse(msg3), ref sReturn);
+
+ ds = oCN.RunProcReturn("select isnull(sum(HQty),0) from Sc_ProcessExchangeBillMain where HICMOBillNo='" + oBill.omodel.HICMOBillNo + "' and HInterID <>"+ oBill.omodel.HInterID, "Sc_ProcessExchangeBillMain");
+ var HQty = double.Parse(ds.Tables[0].Rows[0][0].ToString());
+ int num = 0;
+ //鍗曟嵁鏁伴噺 * 寮犳暟 + 宸茬敓鎴愪笉鍖呮嫭鏈崟鎹殑鏁伴噺 >鐢熶骇璁㈠崟鏁伴噺
+ if ((oBill.omodel.HQty * msg2) + HQty > oBill.omodel.HPlanQty)
+ {
+ if (((oBill.omodel.HPlanQty - oBill.omodel.HQty - HQty) % oBill.omodel.HQty) == 0)
+ {
+ num = (int)((oBill.omodel.HPlanQty - oBill.omodel.HQty - HQty) / oBill.omodel.HQty);
+ } else
+ {
+ num = (int)((oBill.omodel.HPlanQty - oBill.omodel.HQty - HQty) / oBill.omodel.HQty);
+ num += 1;
+ }
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏈�澶氬彲浠ュ鍒�" + num + "寮狅紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (num == 0) {
+ double HPlanQty = oBill.omodel.HPlanQty - oBill.omodel.HQty - HQty;
+ for (int i = 0; i < msg2; i++)
+ {
+ oBill.omodel.HBillNo = DBUtility.ClsPub.CreateBillCode("3772", ref DBUtility.ClsPub.sExeReturnInfo, true);
+ oBill.omodel.HDate =DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd"));
+ oBill.omodel.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ oBill.omodel.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
+ oBill.omodel.HChecker = "";
+ oBill.omodel.HCheckDate = "";
+ oBill.omodel.HMaker = msg4;
+
+ if (HPlanQty < oBill.omodel.HQty)
+ {
+ oBill.omodel.HQty = HPlanQty;
+ }
+
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+
+ bResult = oBill.AddBill(ref sReturn);
+ if (bResult)
+ {
+ num++;
+ HPlanQty -= oBill.omodel.HQty;
+ }
+ }
+
+ }
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "澶嶅埗浜�" + num + "寮犲崟鎹紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#region[鎵归噺鏂板鍗曟嵁-淇濆瓨鎸夐挳]
/// <summary>
/// 鏂板鍗曟嵁-淇濆瓨鎸夐挳
diff --git a/WebAPI/Controllers/LMESController.cs b/WebAPI/Controllers/LMESController.cs
index 88641ea..6cc8b4f 100644
--- a/WebAPI/Controllers/LMESController.cs
+++ b/WebAPI/Controllers/LMESController.cs
@@ -623,7 +623,7 @@
return objJsonResult;
}
- ds = oCN.RunProcReturn("select * from h_v_IF_ICMOBillList where 1 = 1 " + sWhere + " order by 鍗曟嵁鍙� desc", "h_v_IF_ICMOBillList");
+ ds = oCN.RunProcReturn("select * from h_v_IF_ICMOBillList where 1 = 1 " + sWhere + " order by 鍒跺崟鏃ユ湡 desc,鍗曟嵁鍙� desc", "h_v_IF_ICMOBillList");
}
catch (Exception e)
{
diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterTypeBillController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterTypeBillController.cs"
index b290f2b..a40aca1 100644
--- "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterTypeBillController.cs"
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterTypeBillController.cs"
@@ -477,11 +477,11 @@
foreach (DataRow row in ds.Tables[0].Rows)
{
- var strLen = row["hnumber"].ToString().Split('.');
+ var strLen = row["hitemid"].ToString().Split('.');
if (strLen.Length == 1)
{
TreeModel tree = new TreeModel();
- tree.id = row["hnumber"].ToString();
+ tree.id = row["hitemid"].ToString();
tree.title = row["hname"].ToString();
treeModels[0].children.Add(tree);
}
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs" "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs"
index cd608e4..6fb9165 100644
--- "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs"
+++ "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs"
@@ -287,11 +287,13 @@
(HBillType,HInterID,HBillNo,HDate,HPRDORGID
,HYear,HPeriod,HRemark,HMaker,HMakeDate
,HSeOrderBillNo,HSeOrderInterID,HSeOrderEntryID,HEmpID,HCusID
- ,HCenterID,HPlanQty,HDeptID,HMaterID,HUnitID,HBomID,HPlanBeginDate,HPlanEndDate,HBillStatus)
+ ,HCenterID,HPlanQty,HDeptID,HMaterID,HUnitID,HBomID,HPlanBeginDate,HPlanEndDate,HBillStatus
+ ,HOWNERID)
values('3710'," + mainList[0].HInterID + ",'" + mainList[0].HBillNo + "','" + mainList[0].HDate + "'," + mainList[0].HPRDORGID +
"," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + mainList[0].HRemark + "','" + mainList[0].HMaker + "',getdate()" +
",'" + mainList[0].HSeOrderBillNo + "'," + mainList[0].HSeOrderInterID + "," + mainList[0].HSeOrderEntryID + "," + mainList[0].HEmpID + "," + mainList[0].HCusID +
- "," + mainList[0].HCenterID + "," + mainList[0].HPlanQty + ",0,0,0,0,'','',2) ");
+ "," + mainList[0].HCenterID + "," + mainList[0].HPlanQty + ",0,0,0,0,'','',2" +
+ ","+ mainList[0].HOWNERID + ") ");
//淇濆瓨涓昏〃
foreach (var oSub in subList)
{
@@ -301,13 +303,13 @@
,HBeginDate,HEndDate
,HMaterID,HUnitID,HRemark,HSourceID,HDeptID,HSTATUS
,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney
- ,HCOSTRATE,HISBACKFLUSH,HBatchNo,HBomID,HCHECKPRODUCT,HSEQ)
+ ,HCOSTRATE,HISBACKFLUSH,HBatchNo,HBomID,HCHECKPRODUCT,HSEQ,HSTOCKINORGID)
values({oSub.HInterID},{oSub.HEntryID},{(oSub.HQty == null ? 0 : oSub.HQty)}
,'{(oSub.HPlanBeginDate == null ? DateTime.Now.ToString("yyyy-MM-dd") : oSub.HPlanBeginDate.ToString())}','{(oSub.HPlanEndDate == null ? DateTime.Now.AddDays(1).ToString("yyyy-MM-dd") : oSub.HPlanEndDate.ToString())}'
,'{(oSub.HPlanBeginDate == null ? DateTime.Now.ToString("yyyy-MM-dd") : oSub.HPlanBeginDate.ToString())}','{(oSub.HPlanEndDate == null ? DateTime.Now.AddDays(1).ToString("yyyy-MM-dd") : oSub.HPlanEndDate.ToString())}'
,{oSub.HMaterID},{oSub.HUnitID},'{oSub.HRemark}',{oSub.HSourceID},{oSub.HDeptID},4
,0,0,'','',0,0
- ,{oSub.HCOSTRATE},{oSub.HISBACKFLUSH},'{oSub.HBatchNo}',{oSub.HBomID},{oSub.HCHECKPRODUCT},{oSub.HSEQ})");
+ ,{oSub.HCOSTRATE},{oSub.HISBACKFLUSH},'{oSub.HBatchNo}',{oSub.HBomID},{oSub.HCHECKPRODUCT},{oSub.HSEQ},{oSub.HSTOCKINORGID})");
}
foreach (var _item in _mainList)
--
Gitblit v1.9.1