WebAPI/Controllers/CJGL/Cj_CallGoodsBillBackController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Controllers/SCGL/Sc_CallGoodsBackRequestBillController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Controllers/SCGL/Sc_ComplementGoodBillController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Controllers/SCGL/Sc_ComplementGoodsController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
WebAPI/Controllers/CJGL/Cj_CallGoodsBillBackController.cs
@@ -76,6 +76,7 @@ } } #endregion #region 叫料退料单 删除 [Route("Cj_CallGoodsBillBack/DelCallGoodsBill")] [HttpGet] @@ -93,7 +94,7 @@ return objJsonResult; } ds = oCN.RunProcReturn($"exec h_p_JIT_BackGoodsBillList_Delete {HInterID},{HEntryID} ", "h_p_JIT_BackGoodsBillList_Delete"); ds = oCN.RunProcReturn($"exec Sc_ComplementGoodBill/Insert_TL_ICStockTuiBill {HInterID},{HEntryID} ", "h_p_JIT_BackGoodsBillList_Delete"); objJsonResult.code = ds.Tables[0].Rows[0][0].ToString(); objJsonResult.count = int.Parse(ds.Tables[0].Rows[0][0].ToString()); @@ -111,5 +112,40 @@ } } #endregion #region 叫料单列表 (默认查询) [Route("Cj_CallGoodsBillBack/JIT_BackGoodsList")] [HttpGet] public object JIT_BackGoodsList(string HInterID, string user) { try { if (HInterID == null || HInterID.Equals("")) { objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = null; objJsonResult.data = new DataTable(); return objJsonResult; } ds = oCN.RunProcReturn($"exec h_p_JIT_BackGoods_Load '{HInterID}'", "h_p_JIT_BackGoods_Load"); 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 = "没有返回任何记录!" + e.ToString(); objJsonResult.data = null; return objJsonResult; } } #endregion } } WebAPI/Controllers/SCGL/Sc_CallGoodsBackRequestBillController.cs
@@ -5,6 +5,8 @@ using Newtonsoft.Json; using DBUtility; using System; using Newtonsoft.Json.Linq; using System.Collections.Generic; namespace WebAPI.Controllers.SCGL { @@ -37,7 +39,7 @@ try { //查看权限 if (!DBUtility.ClsPub.Security_Log("JIT_ComplementGoods", 1, false, user)) if (!DBUtility.ClsPub.Security_Log("JIT_ComplementGoods_Query", 1, false, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -111,5 +113,132 @@ } } #endregion #region 退料申请单 退料确认页面列表 [Route("Sc_CallGoodsBackRequestBill/JIT_BackGoodsList")] [HttpGet] public object JIT_BackGoodsList(string HInterID, string user) { try { ds = oCN.RunProcReturn($"exec h_p_JIT_BackGoods_Load '{HInterID}'", "h_p_JIT_BackGoods_Load"); 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 退料确认 品质确认 //传递参数 public class JIT_BackGoods_PZQR { public int? hmainid = 0; public int? Hsubid = 0; public int? HSupID = 0; public int? HWHID = 0; public string 退料原因 { get; set; } public int? 退回数量 = 0; } [Route("Sc_CallGoodsBackRequestBill/JIT_BackGoodsList_PZQR")] [HttpPost] public object JIT_BackGoodsList_PZQR([FromBody] JObject msg) { var _value = msg["msg"].ToString(); string[] sArray = _value.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries); string msg2 = sArray[0].ToString(); try { msg2 = msg2.Replace("\\", ""); msg2 = msg2.Replace("\n", ""); List<JIT_BackGoods_PZQR> listCa = new List<JIT_BackGoods_PZQR>(); //获取表格数据集合 listCa = JsonConvert.DeserializeObject<List<JIT_BackGoods_PZQR>>(msg2.ToString()); int a = 0; for (int i = 0; i < listCa.Count; i++) { ds = oCN.RunProcReturn($"exec h_p_JIT_BackGoods_QACheck '{listCa[i].hmainid}','{listCa[i].Hsubid}'," + $"{listCa[i].HSupID},{listCa[i].HWHID},'{listCa[i].退料原因}',{listCa[i].退回数量}", "h_p_JIT_BackGoods_QACheck"); if (ds.Tables[0].Rows[0][0].ToString() == "1") { a++; } } if (a == listCa.Count) { objJsonResult.code = ds.Tables[0].Rows[0][0].ToString(); objJsonResult.count = int.Parse(ds.Tables[0].Rows[0][0].ToString()); objJsonResult.Message = ds.Tables[0].Rows[0][1].ToString(); objJsonResult.data = ds.Tables[0]; return objJsonResult; } else if(a>0&&a<listCa.Count) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "未全部品质确认!"; objJsonResult.data = null; return objJsonResult; } else { objJsonResult.code = ds.Tables[0].Rows[0][0].ToString(); objJsonResult.count = int.Parse(ds.Tables[0].Rows[0][0].ToString()); objJsonResult.Message = ds.Tables[0].Rows[0][1].ToString(); 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_CallGoodsBackRequestBill/JIT_BackGoodsList_CKJS")] [HttpPost] public object JIT_BackGoodsList_CKJS([FromBody] JObject msg) { var _value = msg["msg"].ToString(); string[] sArray = _value.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries); string msg2 = sArray[0].ToString(); try { objJsonResult.code = ds.Tables[0].Rows[0][0].ToString(); objJsonResult.count = int.Parse(ds.Tables[0].Rows[0][0].ToString()); objJsonResult.Message = ds.Tables[0].Rows[0][1].ToString(); 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/Sc_ComplementGoodBillController.cs
@@ -110,12 +110,12 @@ public int? 调出仓库id = 0;//调出仓库id public string HMaterialNumberCol { get; set; } public string HMaterialModelCol { get; set; } public string HProcIDCol { get; set; }//HProcID public string HProcID { get; set; }//HProcIDCol public string HProcNameCol { get; set; }//工段 public int HOutOrgIDCol = 0;//HOutOrgID public string HICMOBillNoCol { get; set; }//HICMOBillNo public long HICMOInterIDCol = 0;//HICMOInterID public long HICMOEntryIDCol = 0;//HICMOEntryID public int HOutOrgID = 0;//HOutOrgID public string HICMOBillNo { get; set; }// HICMOBillNoCol public long HICMOInterID = 0;// HICMOInterIDCol public long HICMOEntryID = 0;// HICMOEntryIDCol public long HDeptID = 0;//HDeptID public double HBHGQtyCol = 0; public string 销售订单号 { get; set; }//HSeOrderNOCol @@ -230,11 +230,11 @@ oSub.HModel = listCa[i].HMaterialModelCol; oSub.HWHID = listCa[i].HWHID; oSub.HProcName = listCa[i].HProcNameCol; oSub.HProcID = listCa[i].HProcIDCol; oSub.HOutOrgID = listCa[i].HOutOrgIDCol; oSub.HICMOBillNo = listCa[i].HICMOBillNoCol; oSub.HICMOInterID = listCa[i].HICMOInterIDCol; oSub.HICMOEntryID = listCa[i].HICMOEntryIDCol; oSub.HProcID = listCa[i].HProcID; oSub.HOutOrgID = listCa[i].HOutOrgID; oSub.HICMOBillNo = listCa[i].HICMOBillNo; oSub.HICMOInterID = listCa[i].HICMOInterID; oSub.HICMOEntryID = listCa[i].HICMOEntryID; oSub.HDeptID = listCa[i].HDeptID; oSub.HPlanQty = listCa[i].计划发料数量; oSub.HSeOrderNo = listCa[i].销售订单号; @@ -303,12 +303,12 @@ " (HInterID,HEntryID,HRemark" + ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" + ",HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo,HICMOInterID,HICMOEntryID,HICMOBillNo" + ",HDeptID,HMaterID,HQty,HProcID,HWHID,HSPID,HBillNo_bak" + ",HDeptID,HMaterID,HQty,HProcID,HWHID,HSPID,HBillNo_bak,HOutOrgID" + ") values(" + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HRemark + "'" + "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() + "," + oSub.HSeOrderInterID.ToString() + "," + oSub.HSeOrderEntryID.ToString() + ",'" + oSub.HSeOrderBillNo + "'," + oSub.HICMOInterID.ToString() + "," + oSub.HICMOEntryID.ToString() + ",'" + oSub.HICMOBillNo + "'" + "," + oSub.HDeptID.ToString() + "," + oSub.HMaterID.ToString() + "," + oSub.HQty.ToString() + ",'" + oSub.HProcID + "'," + oSub.HWHID.ToString() + ", " + oSub.HSPID.ToString() +",'') ", ref DBUtility.ClsPub.sExeReturnInfo); "," + oSub.HDeptID.ToString() + "," + oSub.HMaterID.ToString() + "," + oSub.HQty.ToString() + ",'" + oSub.HProcID + "'," + oSub.HWHID.ToString() + ", " + oSub.HSPID.ToString() +",'',"+oSub.HOutOrgID+") ", ref DBUtility.ClsPub.sExeReturnInfo); //主表 @@ -369,7 +369,16 @@ //获取表格数据集合 listCa = JsonConvert.DeserializeObject<List<CallGoodsBill>>(msg2.ToString()); if (listCa[0].退料数量 < 0) int j=0; for (int i = 0; i < listCa.Count; i++) { if (listCa[i].退料数量 > 0) { flag = AddICStockTuiBill(listCa[i], "666601", "不良品退料", HOrgID, ref DBUtility.ClsPub.sExeReturnInfo); j = 1; } } if (j == 0) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -377,8 +386,6 @@ objJsonResult.data = null; return objJsonResult; } flag=AddICStockTuiBill(listCa, "666601", "不良品退料", HOrgID, ref DBUtility.ClsPub.sExeReturnInfo); if (flag) { @@ -408,16 +415,16 @@ } //新增 public bool AddICStockTuiBill(List<CallGoodsBill> listCa,string HBillType,string HBackType,string HOrgID, ref string sReturn) public bool AddICStockTuiBill(CallGoodsBill listCa,string HBillType,string HBackType,string HOrgID, ref string sReturn) { try { Int64 lngBillKey = listCa[0].HSouceInterID == 0 ? 0 : listCa[0].HSouceInterID; Int64 lngBillKeyEntry = listCa[0].HSourceEntryID == 0 ? 0 : listCa[0].HSourceEntryID; double HQty = (double)(listCa[0].退料数量 == 0 ? 0 : listCa[0].退料数量); long HDeptWHID = listCa[0].HSTOCKID == 0 ? 0 : listCa[0].HSTOCKID; string HTuiResult = listCa[0].退料原因 == "" ? "" : listCa[0].退料原因; Int64 lngBillKey = listCa.HSouceInterID == 0 ? 0 : listCa.HSouceInterID; Int64 lngBillKeyEntry = listCa.HSourceEntryID == 0 ? 0 : listCa.HSourceEntryID; double HQty = (double)(listCa.退料数量 == 0 ? 0 : listCa.退料数量); long HDeptWHID = listCa.HSTOCKID == 0 ? 0 : listCa.HSTOCKID; string HTuiResult = listCa.退料原因 == "" ? "" : listCa.退料原因; var HBillNo = DBUtility.ClsPub.CreateBillCode_Prod("6666", ref DBUtility.ClsPub.sExeReturnInfo, true);//获得一个新的单据号 var HBillInterID = DBUtility.ClsPub.CreateBillID_Prod("6666", ref DBUtility.ClsPub.sExeReturnInfo); @@ -425,10 +432,10 @@ //插入子表 oCN.RunProc("Insert into JIT_CallGoodsBackRequestBillSub ( HInterID,HEntryID,HSourceInterID,HSourceEntryID," + "HSourceBillNo,HSourceBillType, HMaterID, HQty, HSCWHID," + " HWHID, HSPID, HResult, HDeptID, HProcID) " + " HWHID, HSPID, HResult, HDeptID, HProcID,HBackReason) " + $"values({HBillInterID},1,{lngBillKey},{ lngBillKeyEntry}," + $"'{listCa[0].HSourceBillNo}',88,{listCa[0].HMaterialID},{HQty},{(listCa[0].调出仓库id==null?0:listCa[0].调出仓库id)}," + $"{HDeptWHID},'','',{listCa[0].HDeptID},'')"); $"'{listCa.HSourceBillNo}',88,{listCa.HMaterialID},{HQty},{(listCa.调出仓库id==null?0:listCa.调出仓库id)}," + $"{HDeptWHID},'','',{listCa.HDeptID},'','{HTuiResult}')"); //插入主表 oCN.RunProc("insert into JIT_CallGoodsBackRequestBillMain(HYear,HPeriod,HInterid,HBillSubType,HBillStatus," + @@ -478,7 +485,17 @@ //获取表格数据集合 listCa = JsonConvert.DeserializeObject<List<CallGoodsBill>>(msg2.ToString()); bool flag = false; if (listCa[0].退料数量 < 0) int j = 0; for (int i = 0; i < listCa.Count; i++) { if (listCa[i].退料数量 > 0) { flag = AddICStockTuiBill(listCa[i], "666602", " 余量退料", HOrgID, ref DBUtility.ClsPub.sExeReturnInfo); j = 1; } } if (j == 0) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -486,8 +503,6 @@ objJsonResult.data = null; return objJsonResult; } flag = AddICStockTuiBill(listCa, "666602", " 余量退料", HOrgID, ref DBUtility.ClsPub.sExeReturnInfo); if (flag) { @@ -547,7 +562,16 @@ listCa = JsonConvert.DeserializeObject<List<CallGoodsBill>>(msg2.ToString()); bool flag = false; if (listCa[0].退料数量 < 0) int j = 0; for (int i = 0; i < listCa.Count; i++) { if (listCa[i].退料数量 > 0) { flag = AddICStockTuiBill(listCa[i], "666603", "报废退料", HOrgID, ref DBUtility.ClsPub.sExeReturnInfo); j = 1; } } if (j == 0) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -555,8 +579,6 @@ objJsonResult.data = null; return objJsonResult; } flag = AddICStockTuiBill(listCa, "666603", "报废退料", HOrgID, ref DBUtility.ClsPub.sExeReturnInfo); if (flag) { @@ -688,7 +710,7 @@ { long HInterID = DBUtility.ClsPub.CreateBillID_Prod("4602", ref DBUtility.ClsPub.sExeReturnInfo); string HBillNo = DBUtility.ClsPub.CreateBillCode_Prod("4602", ref DBUtility.ClsPub.sExeReturnInfo, true); long HOutOrgID = int.Parse(listCa[i].HOutOrgIDCol.ToString()); long HOutOrgID = int.Parse(listCa[i].HOutOrgID.ToString()); long HWHID = int.Parse(listCa[i].HWHID.ToString()); oCN.RunProc($"exec h_p_JIT_ComplementGoods_Insert {HInterID},'{HBillNo}',{HOrgID},'{user}',{HOutOrgID},{HWHID}"); @@ -732,5 +754,83 @@ } #endregion #region 生产叫料平台 退料单新增 [Route("Sc_ComplementGoodBill/Insert_TL_ICStockTuiBill")] [HttpPost] public object Insert_TL_ICStockTuiBill([FromBody] JObject msg) { var _value = msg["msg"].ToString(); string[] sArray = _value.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries); string msg2 = sArray[0].ToString(); string user = sArray[1].ToString(); string HOrgID = sArray[2].ToString(); try { if (!DBUtility.ClsPub.Security_Log("Cj_CallGoodsBillBack_Edit", 1, false, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "无保存权限"; objJsonResult.data = null; return objJsonResult; } msg2 = msg2.Replace("\\", ""); msg2 = msg2.Replace("\n", ""); List<CallGoodsBill> listCa = new List<CallGoodsBill>(); //获取表格数据集合 listCa = JsonConvert.DeserializeObject<List<CallGoodsBill>>(msg2.ToString()); int a = 0; if (listCa.Count > 0) { for (int i = 0; i < listCa.Count; i++) { long HInterID = DBUtility.ClsPub.CreateBillID_Prod("4602", ref DBUtility.ClsPub.sExeReturnInfo); string HBillNo = DBUtility.ClsPub.CreateBillCode_Prod("4602", ref DBUtility.ClsPub.sExeReturnInfo, true); //long HOutOrgID = int.Parse(listCa[i].HOutOrgID.ToString()); //long HWHID = int.Parse(listCa[i].HWHID.ToString()); oCN.RunProc($"exec h_p_JIT_GetCallGoodsBillCount_Back {HInterID},'{HBillNo}',{HOrgID},'{user}'"); a = 1; } if (a == 1) { 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; } } else { objJsonResult.code = "0"; objJsonResult.count = 0; 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/Controllers/SCGL/Sc_ComplementGoodsController.cs
@@ -81,10 +81,46 @@ } #endregion #region 拣料配送单 删除 [Route("Sc_ComplementGoods/DelComplementGoodsList")] [HttpGet] public object DelComplementGoodsList(string HInterID, string HEntryID,string HOrgID, string user) { try { //删除权限 if (!DBUtility.ClsPub.Security_Log("Cj_ComplementGoodsBill_Drop", 1, false, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "无删除权限!"; objJsonResult.data = null; return objJsonResult; } oCN.RunProc($"exec Del_ComplementGoodsBillInfo {HInterID},{HEntryID},{HOrgID}"); 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 #region 配料单列表 [Route("Sc_ComplementGoods/ComplementGoodsBill")] [HttpGet] public object ComplementGoodsBill(string sWhere, string user) public object ComplementGoodsBill(string sWhere) { try { @@ -96,12 +132,45 @@ objJsonResult.data = new DataTable(); return objJsonResult; } //反序列化传递的值 ComplementGoods com = JsonConvert.DeserializeObject<ComplementGoods>(sWhere.ToString()); ds = oCN.RunProcReturn($"exec h_p_JIT_ComplementGoods_Load '{sWhere}'", "h_p_JIT_ComplementGoods_Load"); //ds = oCN.RunProcReturn($"exec h_p_JIT_ComplementGoods_Load '{com.MaterialNumber}','{com.MaterialName}','{com.MaterialModel}','{com.HGD}'," + // $"'{com.HWHName}','{com.HDeptName}','{com.Organization}','{com.user}','{com.HJLStatus}','{com.HBeginDate}','{com.HEndDate}'", "h_p_JIT_ComplementGoodsBillList_Query"); 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_ComplementGoods/ComplementGoodsBill_C")] [HttpGet] public object ComplementGoodsBill_C(string sWhere) { try { if (sWhere == null || sWhere.Equals("")) { objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "Sucess!"; objJsonResult.data = new DataTable(); return objJsonResult; } oCN.RunProc($"exec h_p_JIT_ComplementGoodsBill_C_Add '{sWhere}'"); ds = oCN.RunProcReturn("exec h_p_JIT_GetComplementGoodsBill_C " + sWhere, "h_p_JIT_GetComplementGoodsBill_C"); objJsonResult.code = "1"; objJsonResult.count = 1;