WebAPI/Controllers/BLL/Xt_UserController.cs
@@ -852,5 +852,255 @@ } } #endregion #region æ ¹æ®ç¨æ·ç¼ç æ¥æ¾å·²åé ç¨æ·å表 [Route("Xt_User/UserPlaylist")] [HttpGet] public object UserPlaylist(string HUserID) { try { ds = oCN.RunProcReturn("select HUserID2,ç¨æ·ä»£ç HUserNumber2,ç¨æ·åç§° HUserName2 from h_v_Gy_UserUserList where HUserID='" + HUserID + "' ", "h_v_Gy_UserUserList"); if (ds == null || ds.Tables[0].Rows.Count == 0) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æ ç¨æ·ä¿¡æ¯ï¼"; objJsonResult.data = null; return objJsonResult; } else { objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "Sucessï¼"; objJsonResult.data = ds.Tables[0]; return objJsonResult; } } catch (Exception e) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "Exceptionï¼" + e.ToString(); objJsonResult.data = null; return objJsonResult; } } #endregion #region ç¨æ·å ³èç¨æ·ä¿å [Route("Xt_User/SaveUserUser")] [HttpPost] public object SaveUserUser([FromBody] JObject msg) { 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(); ListModels oListModels = new ListModels(); try { List<Models.Gy_UserUser> lsmain = new List<Models.Gy_UserUser>(); msg2 = msg2.Substring(1, msg2.Length - 2); msg2 = msg2.Replace("\\", ""); msg2 = msg2.Replace("\n", ""); //\n lsmain = oListModels.getObjectByJson_Gy_UserUser(msg2); oCN.BeginTran(); //å é¤å·²ç»å ³èçæ°æ® oCN.RunProc("Delete From Gy_UserByUserRelation where HUserID='" + msg3.ToString() + "'"); foreach (Models.Gy_UserUser oItem in lsmain) { //éæ°åå ¥å ³èæ°æ® oCN.RunProc("insert into Gy_UserByUserRelation (HUserID2,HUserID,HBillType,HUseFlag) values ('" + oItem.HUserID2 + "','" + msg3.ToString() + "','" + "" + "','" + "" + "')"); } oCN.Commit(); objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "ä¿åæåï¼"; //WebAPIController.Add_Log("éè´§å䏿¨", UserName, "çæéè´§å"); 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 æ ¹æ®ç¨æ·ç¼ç æ¥æ¾å·²åé ç©æå表 [Route("Xt_User/MaterPlaylist")] [HttpGet] public object MaterPlaylist(string HUserID) { try { ds = oCN.RunProcReturn("select HMaterID,ç©æä»£ç HMaterNumber,ç©æåç§° HMaterName from h_v_Gy_UserMaterList where HUserID='" + HUserID + "' ", "h_v_Gy_UserMaterList"); if (ds == null || ds.Tables[0].Rows.Count == 0) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æ ç©æä¿¡æ¯ï¼"; objJsonResult.data = null; return objJsonResult; } else { objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "Sucessï¼"; objJsonResult.data = ds.Tables[0]; return objJsonResult; } } catch (Exception e) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "Exceptionï¼" + e.ToString(); objJsonResult.data = null; return objJsonResult; } } #endregion #region ç¨æ·å ³èç©æä¿å [Route("Xt_User/SaveUserMater")] [HttpPost] public object SaveUserMater([FromBody] JObject msg) { 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(); ListModels oListModels = new ListModels(); try { List<Models.Gy_UserMater> lsmain = new List<Models.Gy_UserMater>(); msg2 = msg2.Substring(1, msg2.Length - 2); msg2 = msg2.Replace("\\", ""); msg2 = msg2.Replace("\n", ""); //\n lsmain = oListModels.getObjectByJson_Gy_UserMater(msg2); oCN.BeginTran(); //å é¤å·²ç»å ³èçæ°æ® oCN.RunProc("Delete From Gy_UserMaterRelation where HUserID='" + msg3.ToString() + "'"); foreach (Models.Gy_UserMater oItem in lsmain) { //éæ°åå ¥å ³èæ°æ® oCN.RunProc("insert into Gy_UserMaterRelation (HMaterID,HUserID) values ('" + oItem.HMaterID + "','" + msg3.ToString() + "')"); } oCN.Commit(); objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "ä¿åæåï¼"; //WebAPIController.Add_Log("éè´§å䏿¨", UserName, "çæéè´§å"); 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 æ ¹æ®ç¨æ·ç¼ç æ¥æ¾å·²åé 客æ·å表 [Route("Xt_User/CustomerPlaylist")] [HttpGet] public object CustomerPlaylist(string HUserID) { try { ds = oCN.RunProcReturn("select HCusID,客æ·ä»£ç HCustomerNumber,客æ·åç§° HCustomerName from h_v_Gy_UserCustomerList where HUserID='" + HUserID + "' ", "h_v_Gy_UserCustomerList"); if (ds == null || ds.Tables[0].Rows.Count == 0) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æ 客æ·ä¿¡æ¯ï¼"; objJsonResult.data = null; return objJsonResult; } else { objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "Sucessï¼"; objJsonResult.data = ds.Tables[0]; return objJsonResult; } } catch (Exception e) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "Exceptionï¼" + e.ToString(); objJsonResult.data = null; return objJsonResult; } } #endregion #region ç¨æ·å ³èç©æä¿å [Route("Xt_User/SaveUserCustomer")] [HttpPost] public object SaveUserCustomer([FromBody] JObject msg) { 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(); ListModels oListModels = new ListModels(); try { List<Models.Gy_UserCustomer> lsmain = new List<Models.Gy_UserCustomer>(); msg2 = msg2.Substring(1, msg2.Length - 2); msg2 = msg2.Replace("\\", ""); msg2 = msg2.Replace("\n", ""); //\n lsmain = oListModels.getObjectByJson_Gy_UserCustomer(msg2); oCN.BeginTran(); //å é¤å·²ç»å ³èçæ°æ® oCN.RunProc("Delete From Gy_UserCustomerRelation where HUserID='" + msg3.ToString() + "'"); foreach (Models.Gy_UserCustomer oItem in lsmain) { //éæ°åå ¥å ³èæ°æ® oCN.RunProc("insert into Gy_UserCustomerRelation (HCusID,HUserID) values ('" + oItem.HCusID + "','" + msg3.ToString() + "')"); } oCN.Commit(); objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "ä¿åæåï¼"; //WebAPIController.Add_Log("éè´§å䏿¨", UserName, "çæéè´§å"); objJsonResult.data = 1; return objJsonResult; } catch (Exception e) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "ä¿å失败ï¼" + e.ToString(); objJsonResult.data = 1; return objJsonResult; } } #endregion } } WebAPI/Controllers/CJGL/Cj_CallGoodsBillMainController.cs
@@ -31,7 +31,7 @@ return objJsonResult; } ds = oCN.RunProcReturn("select * from h_v_IF_JIT_CallGoodsBillList where 1=1 " + sWhere + " order by hmainid desc", "h_v_IF_JIT_CallGoodsBillList"); ds = oCN.RunProcReturn("select * from h_v_IF_JIT_CallGoodsBillList where 1=1 " + sWhere + " and å¶å人='"+user+"' order by hmainid desc", "h_v_IF_JIT_CallGoodsBillList"); objJsonResult.code = "1"; objJsonResult.count = 1; WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
@@ -149,7 +149,7 @@ { try { List<object> columnNameList = new List<object>(); //å¾å°ä¿¡æ¯ ds = oCN.RunProcReturn("exec h_p_Sc_ProcExchBilltransRelationQty " + HProcExchHinteID + "", "h_p_Sc_ProcExchBilltransRelationQty"); //åå ¥ä¿¡æ¯ @@ -161,10 +161,20 @@ objJsonResult.data = null; return objJsonResult; } //æ·»å åå foreach (DataColumn col in ds.Tables[0].Columns) { Type dataType = col.DataType; string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//è·åå°DataColumnå对象çåå } objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "Sucessï¼"; objJsonResult.data = ds.Tables[0]; objJsonResult.list = columnNameList; return objJsonResult; } catch (Exception e) @@ -233,7 +243,7 @@ double HMoney = list[0].HMoney;//éé¢ string HRemark = list[0].HRemark;//夿³¨ double HTaxRate = list[0].HTaxRate;//ç¨ç long HProcNo = list[0].HProcNo;//æµæ°´å· string HProcNo = list[0].HProcNo;//æµæ°´å· string HOrderProcNO = list[0].HOrderProcNO;//订åè·è¸ªå· int HWWWorkOrderInterID = 0;//å§å¤å·¥åå·åå ç int HWWWorkOrderEntryID = 0;//å§å¤å·¥åå·ä¸»å å @@ -263,7 +273,7 @@ objJsonResult.data = null; return objJsonResult; } if (HProcNo <= 0) if (HProcNo == "") { objJsonResult.code = "0"; objJsonResult.count = 0; WebAPI/Controllers/CJGL/Cj_StationEntrustOutBillController.cs
@@ -144,7 +144,7 @@ double HMoney = list[0].HMoney;//éé¢ string HRemark = list[0].HRemark;//夿³¨ double HTaxRate = list[0].HTaxRate;//ç¨ç long HProcNo = list[0].HProcNo;//æµæ°´å· string HProcNo = list[0].HProcNo;//æµæ°´å· string HOrderProcNO = list[0].HOrderProcNO;//订åè·è¸ªå· int HWWWorkOrderInterID = 0;//å§å¤å·¥åå·åå ç int HWWWorkOrderEntryID = 0;//å§å¤å·¥åå·ä¸»å å @@ -186,7 +186,7 @@ objJsonResult.data = null; return objJsonResult; } if (HProcNo <= 0) if (HProcNo == "") { objJsonResult.code = "0"; objJsonResult.count = 0; WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
@@ -72,8 +72,8 @@ objJsonResult.data = null; return objJsonResult; } long HProcNo = list[0].HProcNo;//æµæ°´å· if (HProcNo <= 0) string HProcNo = list[0].HProcNo;//æµæ°´å· if (HProcNo == "") { objJsonResult.code = "0"; objJsonResult.count = 0; WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
@@ -100,7 +100,7 @@ double HMoney = 0; double HBadCount = list[0].HBadCount;//ä¸è¯æ°é long HCenterID = list[0].HCenterID;//å·¥ä½ä¸å¿ID long HProcNo = list[0].HProcNo;//æµæ°´å· string HProcNo = list[0].HProcNo;//æµæ°´å· string HOrderProcNO = list[0].HOrderProcNO;//订åè·è¸ªå· string HSourceNameList = list[0].HSourceNameList;//è®¾å¤æ¸ å long HMainSourceInterID = list[0].HInterID;//éå ¥typeå¾å°çåæ®ID @@ -134,7 +134,7 @@ objJsonResult.data = null; return objJsonResult; } if (HProcNo <= 0) if (HProcNo == "") { objJsonResult.code = "0"; objJsonResult.count = 0; WebAPI/Controllers/SCGL/Sc_ComplementGoodBillController.cs
@@ -105,6 +105,7 @@ public long HSTOCKID = 0;//HSTOCKID public string éæåå { get; set; }//éæåå public int HMaterialID = 0; //HMaterialIDCol public string ç©æä»£ç = ""; public string HSourceBillNo { get; set; }//HSourceBillNoCol public int è°åºä»åºå¯ç¨åºåæ°é = 0;//HKFQtyKYCol public int è°åºä»åºåºåæ°é = 0;//HKFQtySCol @@ -188,6 +189,33 @@ { if (listCa[i].HMaterialID != 0 && listCa[i].嫿æ°é > 0) { var Hqty = 0.0; var TuiHqty = 0.0; //å½å忮已嫿 å 已鿿°é ds = oCN.RunProcReturn($@" select isnull(a.HQty,0) 已嫿æ°é,isnull(b.HQty,0) å·²éæç³è¯·æ°é from ( select sum(b.HQty) HQty,c.HNumber ,b.HSourceBillNo from JIT_CallGoodsBillMain a join JIT_CallGoodsBillSub b on a.HInterID=b.HInterID left join Gy_Material c on b.HMaterID=c.HItemID where b.HSourceBillNo='{listCa[i].HSourceBillNo}' group by c.HNumber,b.HSourceBillNo ) a left join ( select sum(b.HQty) HQty,c.HNumber,b.HSourceBillNo from JIT_CallGoodsBackRequestBillMain a inner join JIT_CallGoodsBackRequestBillSub b on a.HInterID=b.HInterID left join Gy_Material c on b.HMaterID=c.HItemID where b.HSourceBillNo='{listCa[i].HSourceBillNo}' group by c.HNumber,b.HSourceBillNo ) b on a.HNumber=b.HNumber and a.HSourceBillNo=b.HSourceBillNo where a.HNumber='{listCa[i].ç©æä»£ç }'", "JIT_CallGoodsBillMain"); if (ds.Tables[0].Rows.Count > 0) { Hqty = double.Parse(ds.Tables[0].Rows[0]["已嫿æ°é"].ToString()); TuiHqty = double.Parse(ds.Tables[0].Rows[0]["å·²éæç³è¯·æ°é"].ToString()); } if (listCa[i].嫿æ°é > listCa[i].计ååææ°é) { objJsonResult.code = "0"; @@ -197,7 +225,20 @@ return objJsonResult; } if (listCa[i].åºåæ°é == 0 && listCa[i].嫿æ°é > 0) if((listCa[i].嫿æ°é + Hqty - TuiHqty)> listCa[i].计ååææ°é) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "å«ææ»æ°é大äºè®¡ååææ°é!"; objJsonResult.data = null; return objJsonResult; } ds = oCN.RunProcReturn("select * from h_v_JIT_WarehouseList where ä»åºID=" + listCa[i].è°åºä»åºid + " and ç©æç¼ç = '" + listCa[i].ç©æä»£ç + "' and åºåç»ç»=" + listCa[i].HOutOrgID, "h_v_JIT_WarehouseList"); var HSCWHIDCount= double.Parse(ds.Tables[0].Rows[0]["è°åºä»åºå¯ç¨åºåæ°é"].ToString()); if (HSCWHIDCount == 0 && listCa[i].嫿æ°é > 0) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -206,7 +247,7 @@ return objJsonResult; } if (listCa[i].嫿æ°é > listCa[i].åºåæ°é) if (listCa[i].嫿æ°é > HSCWHIDCount) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -241,15 +282,6 @@ objJsonResult.data = null; return objJsonResult; } //if (listCa[i].è°åºä»åºå¯ç¨åºåæ°é == 0) //{ // objJsonResult.code = "0"; // objJsonResult.count = 0; // objJsonResult.Message = "è°åºä»åºå¯ç¨åºåæ°é为0!"; // objJsonResult.data = null; // return objJsonResult; //} j = 1; @@ -401,7 +433,7 @@ string msg2 = sArray[0].ToString(); DBUtility.ClsPub.CurUserName = sArray[1].ToString(); string HOrgID = sArray[2].ToString(); bool flag = false; json flag =new json(); try { @@ -425,47 +457,17 @@ { if (listCa[i].éææ°é > 0) { if (listCa[i].éææ°é > listCa[i].å·²é éæ°é&& listCa[i].å·²é éæ°é>0) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "éææ°é大äºå·²é éæ°é!"; objJsonResult.data = null; return objJsonResult; } ds = oCN.RunProcReturn("select isnull(sum(d.HQty),0) HQty from JIT_CallGoodsBackRequestBillSub c inner join JIT_CallGoodsBackBillSub d on c.HInterID = d.HSourceInterID and c.HEntryID = d.HSourceEntryID and c.HMaterID = d.HMaterID " + $"where c.HSourceInterID={listCa[i].HSouceInterID} and c.HSourceEntryID ={listCa[i].HSourceEntryID} and c.HSourceBillNo = '{listCa[i].HSourceBillNo}' and c.HMaterID={listCa[i].HMaterialID}", "JIT_CallGoodsBackRequestBillSub"); if ((double.Parse(ds.Tables[0].Rows[0][0].ToString()==""?"0": ds.Tables[0].Rows[0][0].ToString()) +listCa[i].éææ°é) > listCa[i].已嫿æ°é) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = $"å·²ç»éææ°é:{double.Parse(ds.Tables[0].Rows[0][0].ToString())},å¯éææ°é为:{(listCa[i].已嫿æ°é - double.Parse(ds.Tables[0].Rows[0][0].ToString()))}!"; objJsonResult.data = null; return objJsonResult; } if (listCa[i].è°å ¥ä»åºid == 0) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "è¯·éæ©è°å ¥ä»åº!"; objJsonResult.data = null; return objJsonResult; } if (listCa[i].è°åºä»åºid == 0) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "è¯·éæ©è°åºä»åº!"; objJsonResult.data = null; return objJsonResult; } flag = AddICStockTuiBill(listCa[i], "666601", "ä¸è¯åéæ", HOrgID, ref DBUtility.ClsPub.sExeReturnInfo); flag = (json)AddICStockTuiBill(listCa[i], "666601", "ä¸è¯åéæ", HOrgID); j = 1; if (flag.code == "0") { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = objJsonResult.Message; objJsonResult.data = null; return objJsonResult; } } } if (j == 0) @@ -477,22 +479,11 @@ return objJsonResult; } if (flag) { objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "ä¸è¯åéææå!"; objJsonResult.data = null; return objJsonResult; } else { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "ä¸è¯åéæå¤±è´¥!"; objJsonResult.data = null; return objJsonResult; } objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "ä¸è¯åéææå!"; objJsonResult.data = null; return objJsonResult; } catch (Exception e) { @@ -505,10 +496,62 @@ } //æ°å¢ public bool AddICStockTuiBill(CallGoodsBill listCa,string HBillType,string HBackType,string HOrgID, ref string sReturn) public object AddICStockTuiBill(CallGoodsBill listCa,string HBillType,string HBackType,string HOrgID) { try { if (listCa.éææ°é > listCa.å·²é éæ°é && listCa.å·²é éæ°é > 0) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "éææ°é大äºå·²é éæ°é!"; objJsonResult.data = null; return objJsonResult; } if (listCa.è°å ¥ä»åºid == 0) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "è¯·éæ©è°å ¥ä»åº!"; objJsonResult.data = null; return objJsonResult; } if (listCa.è°åºä»åºid == 0) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "è¯·éæ©è°åºä»åº!"; objJsonResult.data = null; return objJsonResult; } var THqty = 0.0; ds = oCN.RunProcReturn($@" select sum(b.HQty) HQty,c.HNumber,b.HSourceBillNo from JIT_CallGoodsBackRequestBillMain a inner join JIT_CallGoodsBackRequestBillSub b on a.HInterID=b.HInterID left join Gy_Material c on b.HMaterID=c.HItemID where c.HNumber='{listCa.ç©æä»£ç }' and b.HSourceBillNo='{listCa.HSourceBillNo}' group by c.HNumber,b.HSourceBillNo ", "JIT_CallGoodsBackRequestBillMain"); if (ds.Tables[0].Rows.Count > 0) { THqty = double.Parse(ds.Tables[0].Rows[0]["HQty"].ToString()); } if ((listCa.éææ°é + THqty) > listCa.å·²é éæ°é) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "ç´¯è®¡éææ°é大äºå·²é éæ°é!"; objJsonResult.data = null; return objJsonResult; } Int64 lngBillKey = listCa.HSouceInterID == 0 ? 0 : listCa.HSouceInterID; Int64 lngBillKeyEntry = listCa.HSourceEntryID == 0 ? 0 : listCa.HSourceEntryID; double HQty = (double)(listCa.éææ°é == 0 ? 0 : listCa.éææ°é); @@ -534,13 +577,17 @@ $" '{HBillType}','{DateTime.Now}','{HBillNo}',{HOrgID},'{ DBUtility.ClsPub.CurUserName}','{DateTime.Now}','','',0,0,0,''," + $" 0, 0, {listCa.HOutOrgID}, {HOrgID}, 0,'{HBackType}')"); sReturn = "æ°å¢åæ®æåï¼"; oCN.Commit(); return true; objJsonResult.code = "1"; objJsonResult.Message = "æ°å¢åæ®æåï¼"; return objJsonResult; } catch (Exception e) { sReturn = e.Message; objJsonResult.code = "0"; objJsonResult.Message = e.Message; ; return objJsonResult; throw (e); } } @@ -573,36 +620,23 @@ List<CallGoodsBill> listCa = new List<CallGoodsBill>(); //è·åè¡¨æ ¼æ°æ®éå listCa = JsonConvert.DeserializeObject<List<CallGoodsBill>>(msg2.ToString()); bool flag = false; json flag = new json(); int j = 0; for (int i = 0; i < listCa.Count; i++) { if (listCa[i].éææ°é > 0) { if (listCa[i].éææ°é > listCa[i].å·²é éæ°é && listCa[i].å·²é éæ°é > 0) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "éææ°é大äºå·²é éæ°é!"; objJsonResult.data = null; return objJsonResult; } ds = oCN.RunProcReturn("select sum(d.HQty) HQty from JIT_CallGoodsBackRequestBillSub c inner join JIT_CallGoodsBackBillSub d on c.HInterID = d.HSourceInterID and c.HEntryID = d.HSourceEntryID and c.HMaterID = d.HMaterID " + $"where c.HSourceInterID={listCa[i].HSouceInterID} and c.HSourceEntryID ={listCa[i].HSourceEntryID} and c.HSourceBillNo = '{listCa[i].HSourceBillNo}' and c.HMaterID={listCa[i].HMaterialID}", "JIT_CallGoodsBackRequestBillSub"); if ((double.Parse(ds.Tables[0].Rows[0][0].ToString() == "" ? "0" : ds.Tables[0].Rows[0][0].ToString()) + listCa[i].éææ°é) > listCa[i].已嫿æ°é) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = $"å·²ç»éææ°é:{double.Parse(ds.Tables[0].Rows[0][0].ToString())},å¯éææ°é为:{(listCa[i].已嫿æ°é - double.Parse(ds.Tables[0].Rows[0][0].ToString()))}!"; objJsonResult.data = null; return objJsonResult; } flag = AddICStockTuiBill(listCa[i], "666602", " ä½ééæ", HOrgID, ref DBUtility.ClsPub.sExeReturnInfo); flag =(json)AddICStockTuiBill(listCa[i], "666602", " ä½ééæ", HOrgID); j = 1; if (flag.code == "0") { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = objJsonResult.Message; objJsonResult.data = null; return objJsonResult; } } } if (j == 0) @@ -614,23 +648,11 @@ return objJsonResult; } if (flag) { objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "ä½ééææå!"; objJsonResult.data = null; return objJsonResult; } else { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "ä½ééæå¤±è´¥!"; objJsonResult.data = null; return objJsonResult; } objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "ä½ééææå!"; objJsonResult.data = null; return objJsonResult; } catch (Exception e) { @@ -671,35 +693,22 @@ //è·åè¡¨æ ¼æ°æ®éå listCa = JsonConvert.DeserializeObject<List<CallGoodsBill>>(msg2.ToString()); bool flag = false; json flag = new json(); int j = 0; for (int i = 0; i < listCa.Count; i++) { if (listCa[i].éææ°é > 0) { if (listCa[i].éææ°é > listCa[i].å·²é éæ°é && listCa[i].å·²é éæ°é > 0) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "éææ°é大äºå·²é éæ°é!"; objJsonResult.data = null; return objJsonResult; } ds = oCN.RunProcReturn("select sum(d.HQty) HQty from JIT_CallGoodsBackRequestBillSub c inner join JIT_CallGoodsBackBillSub d on c.HInterID = d.HSourceInterID and c.HEntryID = d.HSourceEntryID and c.HMaterID = d.HMaterID " + $"where c.HSourceInterID={listCa[i].HSouceInterID} and c.HSourceEntryID ={listCa[i].HSourceEntryID} and c.HSourceBillNo = '{listCa[i].HSourceBillNo}' and c.HMaterID={listCa[i].HMaterialID}", "JIT_CallGoodsBackRequestBillSub"); if ((double.Parse(ds.Tables[0].Rows[0][0].ToString() == "" ? "0" : ds.Tables[0].Rows[0][0].ToString()) + listCa[i].éææ°é) > listCa[i].已嫿æ°é) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = $"å·²ç»éææ°é:{double.Parse(ds.Tables[0].Rows[0][0].ToString())},å¯éææ°é为:{(listCa[i].已嫿æ°é - double.Parse(ds.Tables[0].Rows[0][0].ToString()))}!"; objJsonResult.data = null; return objJsonResult; } flag = AddICStockTuiBill(listCa[i], "666603", "æ¥åºéæ", HOrgID, ref DBUtility.ClsPub.sExeReturnInfo); flag =(json) AddICStockTuiBill(listCa[i], "666603", "æ¥åºéæ", HOrgID); j = 1; if (flag.code == "0") { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = objJsonResult.Message; objJsonResult.data = null; return objJsonResult; } } } if (j == 0) @@ -711,22 +720,11 @@ return objJsonResult; } if (flag) { objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "æ¥åºéææå!"; objJsonResult.data = null; return objJsonResult; } else { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æ¥åºéæå¤±è´¥!"; objJsonResult.data = null; return objJsonResult; } objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "æ¥åºéææå!"; objJsonResult.data = null; return objJsonResult; } catch (Exception e) { @@ -946,5 +944,68 @@ } #endregion #region çäº§å«æå¹³å° ä»åºåºåå表 [Route("Sc_ComplementGoodBill/GetWarehouseList_JIT")] [HttpGet] public object GetWarehouseList_JIT(string sWhere) { try { ds = oCN.RunProcReturn("select * from h_v_JIT_WarehouseList where 1=1 "+ sWhere, "h_v_JIT_WarehouseList"); objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "Sucessï¼"; objJsonResult.data = ds.Tables[0]; return objJsonResult; } catch (Exception e) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "Exceptionï¼" + e.ToString(); objJsonResult.data = null; return objJsonResult; } } #endregion #region çäº§å«æå¹³å° æªçææ£æç³è¯·å æªçæéæå [Route("Sc_ComplementGoodBill/NotGeneratedMaterialList")] [HttpGet] public object NotGeneratedMaterialList(string sWhere, string user) { try { //æ¥è¯¢å«æå æªçæ æ£æå çæ¡æ° //æ¥è¯¢éæç³è¯·å æªçæ éæåç æ¡æ° ds = oCN.RunProcReturn($@"select count(*) æªçæ from JIT_CallGoodsBackRequestBillMain as a inner join JIT_CallGoodsBackRequestBillSub as b on a.HInterID=b.HInterID where a.HISCheck =0 and a.HOrgID={sWhere} and a.HMaker = '{user}' union all select count(*) æªçæ from JIT_CallGoodsBillMain a join JIT_CallGoodsBillSub b on a.HInterID=b.HInterID where b.HPSQty=0 and a.HOrgID={sWhere} and a.HMaker = '{user}'", "JIT_CallGoodsBackRequestBillMain"); objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "Sucessï¼"; objJsonResult.data = ds.Tables[0]; return objJsonResult; } catch (Exception e) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "Exceptionï¼" + e.ToString(); objJsonResult.data = null; return objJsonResult; } } #endregion } } WebAPI/Controllers/SCGL/Èռƻ®¹ÜÀí/JIT_DayPlanPlatFormBillController.cs
@@ -236,12 +236,22 @@ var HICMOBillNo = list[i]["ç产订åå·"].ToString(); var HICMOEntrySEQ = list[i]["ç产订åæç»è¡å·"].ToString(); var HSourceID = list[i]["HSourceID"].ToString(); var HYX = list[i]["ä¼å 级"].ToString(); if (HSourceID == "" || HSourceID == "0") { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = $"第{i + 1}è¡çäº§èµæºä¸è½ä¸ºç©º!"; objJsonResult.data = null; return objJsonResult; } var str = 0; if (!int.TryParse(HYX, out str)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = $"第{i + 1}è¡ä¼å 级:{HYX},请è¾å ¥æ°å!"; objJsonResult.data = null; return objJsonResult; } @@ -258,7 +268,7 @@ return objJsonResult; } oCN.RunProc($"update Sc_WorkBillSortBillMain set HSourceID={(HSourceID == "" ? 0.ToString() : HSourceID)} where HInterID={list[i]["hmainid"].ToString()} and HBillNo='{list[i]["åæ®å·"].ToString()}'"); oCN.RunProc($"update Sc_WorkBillSortBillMain set HSourceID={(HSourceID == "" ? 0.ToString() : HSourceID)},HYX={HYX} where HInterID={list[i]["hmainid"].ToString()} and HBillNo='{list[i]["åæ®å·"].ToString()}'"); } oCN.RunProc($"update Sc_WorkBillSortBillMain set HDayPlanSumQty={list[i]["æ¥è®¡åæ°éæ»é"].ToString()} where HInterID={(HInterID==0?int.Parse(list[i]["hmainid"].ToString()):HInterID)} and HBillNo='{(HBillNo==""?list[i]["åæ®å·"].ToString(): HBillNo)}'"); @@ -514,6 +524,14 @@ /// ä»åºç¼ç /// </summary> public string FStockNumber { get; set; } /// <summary> /// æ¹å· /// </summary> public string HLOT { get; set; } /// <summary> /// id /// </summary> public string HInventoryFID { get; set; } } #endregion @@ -677,6 +695,9 @@ public string FStock { get; set; } //è½¦é´ public string FWorkShop { get; set; } //æ¹å· public string HLOT { get; set; } public string HInventoryFID { get; set; } } #endregion @@ -736,10 +757,11 @@ //è·åå½å峿¶åºå åºåæ°é+åºåç»ç»+ç©æ+货主+ä»åº ds = oCN.RunProcReturn(@" select distinct isnull(a.FBASEQTY,0) FBASEQTY,b.FNumber,a.FOwnerTypeId,a.FOwnerId,c.FNUMBER as FOwnerNumber,a.FSTOCKID,d.FNUMBER as FStockNumber from select distinct isnull(a.FBASEQTY,0) FBASEQTY,b.FNumber,a.FOwnerTypeId,a.FOwnerId,c.FNUMBER as FOwnerNumber,a.FSTOCKID,d.FNUMBER as FStockNumber ,a.FLOT HLOT,a.FID HInventoryFID from ( select distinct a.HProdORGID FStockOrgId,T2.FMATERIALID,FNumber from SC_WORKBILLSORTBILLMAIN a join SC_WORKBILLSORTBILLSub b on a.HInterID = b.HInterID select distinct a.HProdORGID FStockOrgId,T2.FMATERIALID,FNumber from Sc_WorkBillSortBillMain a join Sc_WorkBillSortBillSub b on a.HInterID = b.HInterID join AIS20210811135644..T_PRD_PPBOM T1 on a.HICMOInterID_Sec = t1.FMoId and a.HICMOEntryID_Sec = t1.FMOENTRYID LEFT JOIN AIS20210811135644..T_PRD_PPBOMENTRY T2 on T1.FID = t2.FID join AIS20210811135644..T_BD_MATERIAL T3 on T2.FMATERIALID = T3.FMATERIALID @@ -954,7 +976,9 @@ FComPlete = jskcQty >= need ? "é½å¥" : "æªé½å¥", FPlanDate = item.HMasterDate, // æ¥è®¡åæ¥æ FStock = Inventory.FSTOCKID,//ä»åº FWorkShop = _item.HWorkShopID //è½¦é´ FWorkShop = _item.HWorkShopID, //è½¦é´ HLOT = Inventory.HLOT, //æ¹å· HInventoryFID = Inventory.HInventoryFID //id }); //æ£åæ»åºåæ°é jskcQty = jskcQty >= fCompleteCount ? jskcQty - fCompleteCount : 0; @@ -1033,6 +1057,8 @@ insertDT.Columns.Add("FWORKSHOPID", typeof(long)); insertDT.Columns.Add("FSTOCKID", typeof(long)); insertDT.Columns.Add("FOCCUPYPICKEDCOUNT", typeof(decimal)); insertDT.Columns.Add("HLOT", typeof(long)); insertDT.Columns.Add("HInventoryFID", typeof(string)); int jdtmmm = 1; ds = oCN.RunProcReturn("select max(HInterID)FID FROM JIT_MOMaterReadysBill", "JIT_MOMaterReadysBill"); int maxFid = int.Parse(ds.Tables[0].Rows[0][0].ToString() == "" ? "0" : ds.Tables[0].Rows[0][0].ToString()); @@ -1065,6 +1091,8 @@ dr["FWORKSHOPID"] = item.FWorkShop == null ? "0" : item.FWorkShop; dr["FSTOCKID"] = item.FStock == null ? "0" : item.FStock; dr["FOCCUPYPICKEDCOUNT"] = item.FOccupyPickedCount; dr["HLOT"] = item.HLOT == null? "0" : item.HLOT; dr["HInventoryFID"] = item.HInventoryFID == null ? "0" : item.HInventoryFID; insertDT.Rows.Add(dr); jdtmmm++; } @@ -1080,12 +1108,14 @@ ", HICMOEntryID, HMaterID, HStockORGID, HStockQty, HLeftQty" + ", HProdORGID, HUnitDosage, HSumPlanQty, HICMOBillNo, HOwnerID" + ", HOwnerTypeID, HPlanDate, HComplete, HLackQty, HOccupyQty" + ", HCompleteQty1, HErpClsID, HWorkShopID, HWHID, HOccupyPickedQTY,HMainICMOBillNo)values" + ", HCompleteQty1, HErpClsID, HWorkShopID, HWHID, HOccupyPickedQTY,HMainICMOBillNo" + ",HLOT,HInventoryFID)values" + $"({item["FID"].ToString()}, 1, {item["FHMAINICMOINTERIDR"].ToString()}, {item["FHMAINICMOENTRYID"].ToString()}, {item["FHICMOINTERID"].ToString()}" + $", {item["FHICMOENTRYID"].ToString()}, {item["FHMATERID"].ToString()}, {item["FHSTOCKORGID"].ToString()}, {item["FHSTOCKQTY"].ToString()}, {item["FHLEFTQTY"].ToString()}" + $" , {item["FHPRDORGID"].ToString()}, {item["FUNITDOSAGE"].ToString()}, {item["FSUMPLANCOUNT"].ToString()}, '{item["FPRDBILLNO"].ToString()}', {item["FOWNERID"].ToString()}" + $", '{item["FOWNERTYPEID"].ToString()}', '{item["FPLANDATE"].ToString()}','{item["FCOMPLETE"].ToString()}', {item["FLACKCOUNT"].ToString()}, {item["FOCCUPYCOUNT"].ToString()}" + $", {item["FCOMPLETECOUNT1"].ToString()}, {item["FERPCLSID"].ToString()}, {item["FWORKSHOPID"].ToString()}, {item["FSTOCKID"].ToString()}, {item["FOCCUPYPICKEDCOUNT"].ToString()}, '{item["HMainICMOBillNo"].ToString()}')"); $", {item["FCOMPLETECOUNT1"].ToString()}, {item["FERPCLSID"].ToString()}, {item["FWORKSHOPID"].ToString()}, {item["FSTOCKID"].ToString()}, {item["FOCCUPYPICKEDCOUNT"].ToString()}, '{item["HMainICMOBillNo"].ToString()}'" + $",{item["HLOT"].ToString()},'{item["HInventoryFID"].ToString()}')"); } LogService.Write("æ¹éæå ¥å°æ°æ®åºç¨æ¶ï¼" + sw.Elapsed); //æ§è¡å®æå æ´æ°æ¥è®¡åå·¥åç¶æ WebAPI/Controllers/SCGL/Èռƻ®¹ÜÀí/JIT_ICMOSortBillController.cs
@@ -78,5 +78,42 @@ } } #endregion #region ç产æ¥è®¡å è½¦é´æ§è¡ç¡®è®¤ æ¤éè½¦é´æ§è¡ç¡®è®¤ [Route("JIT_ICMOSortBill/JIT_ICMOSortBillWorkShopTure")] [HttpGet] public object JIT_ICMOSortBillWorkShopTure(string HSourceID, string HICMOInterID, DateTime HDate, int HStatus, string user) { try { ds = oCN.RunProcReturn($"select * from Sc_ICMOBillStatus_Tmp_Extend where HSourceID = {HSourceID} and HSourceInterID = {HICMOInterID} and HDate = '{HDate.ToString("yyyy-MM-dd HH:mm:ss.fff")}' ", "Sc_ICMOBillStatus_Tmp_Extend"); if (ds.Tables[0].Rows.Count == 0) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "ä»åºæªç¡®è®¤,ä¸è½è¿è¡è½¦é´ç¡®è®¤ï¼"; objJsonResult.data = null; return objJsonResult; } oCN.RunProc("exec h_p_Sc_SetICMOStatus_ReadyStart " + HSourceID.ToString() + "," + HICMOInterID.ToString() + ",'" + HDate.ToString("yyyy-MM-dd HH:mm:ss.fff") + "'," + HStatus.ToString() + ",'" + user + "'"); objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "æ§è¡æåï¼"; objJsonResult.data = null; return objJsonResult; } catch (Exception e) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "Exceptionï¼" + e.ToString(); objJsonResult.data = null; return objJsonResult; } } #endregion } } WebAPI/ListModels.cs
@@ -1794,6 +1794,42 @@ } /// <summary> /// ç¨æ·-ç¨æ·å ³ç³»ä¿¡æ¯è¡¨çjson /// </summary> /// <param name="jsonString"></param> /// <returns></returns> public List<Models.Gy_UserUser> getObjectByJson_Gy_UserUser(string jsonString) { jsonString = "[" + jsonString.ToString() + "]"; List<Models.Gy_UserUser> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.Gy_UserUser>>(jsonString); return list; } /// <summary> /// ç¨æ·ç©æå ³ç³»ä¿¡æ¯è¡¨çjson /// </summary> /// <param name="jsonString"></param> /// <returns></returns> public List<Models.Gy_UserMater> getObjectByJson_Gy_UserMater(string jsonString) { jsonString = "[" + jsonString.ToString() + "]"; List<Models.Gy_UserMater> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.Gy_UserMater>>(jsonString); return list; } /// <summary> /// ç¨æ·å®¢æ·å ³ç³»ä¿¡æ¯è¡¨çjson /// </summary> /// <param name="jsonString"></param> /// <returns></returns> public List<Models.Gy_UserCustomer> getObjectByJson_Gy_UserCustomer(string jsonString) { jsonString = "[" + jsonString.ToString() + "]"; List<Models.Gy_UserCustomer> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.Gy_UserCustomer>>(jsonString); return list; } /// <summary> /// ç¨æ·ç»ç»å ³ç³»ä¿¡æ¯è¡¨çjson /// </summary> /// <param name="jsonString"></param> WebAPI/Models/Gy_UserCustomer.cs
New file @@ -0,0 +1,14 @@ using System; using System.Collections.Generic; using System.Linq; using System.Web; namespace WebAPI.Models { public class Gy_UserCustomer { public int HCusID { get; set; } public string HCustomerNumber { get; set; } public string HCustomerName { get; set; } } } WebAPI/Models/Gy_UserMater.cs
New file @@ -0,0 +1,14 @@ using System; using System.Collections.Generic; using System.Linq; using System.Web; namespace WebAPI.Models { public class Gy_UserMater { public int HMaterID { get; set; } public string HMaterNumber { get; set; } public string HMaterName { get; set; } } } WebAPI/Models/Gy_UserUser.cs
New file @@ -0,0 +1,14 @@ using System; using System.Collections.Generic; using System.Linq; using System.Web; namespace WebAPI.Models { public class Gy_UserUser { public int HUserID2 { get; set; } public string HUserNumber2 { get; set; } public string HUserName2 { get; set; } } } WebAPI/Models/StationBill.cs
@@ -33,7 +33,7 @@ public double HMoney { get; set; } public string HRemark { get; set; } public double HTaxRate { get; set; } public long HProcNo { get; set; } public string HProcNo { get; set; } public string HOrderProcNO { get; set; } public long HWWWorkOrderInterID { get; set; } public long HWWWorkOrderEntryID { get; set; } WebAPI/WebAPI.csproj
@@ -560,6 +560,9 @@ <Compile Include="Models\ClsSc_AssemblyBillMain.cs" /> <Compile Include="Models\ClsSc_AssemblyBillSub.cs" /> <Compile Include="Models\Employee.cs" /> <Compile Include="Models\Gy_UserCustomer.cs" /> <Compile Include="Models\Gy_UserMater.cs" /> <Compile Include="Models\Gy_UserUser.cs" /> <Compile Include="Models\JIT_Cg_PODemandPlanBillMain.cs" /> <Compile Include="Models\JIT_Cg_PODemandPlanBillSub.cs" /> <Compile Include="Models\Cg_PODemandPlanConfigBillSub.cs" />