DAL/DAL.csproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
DAL/WMS/ClsWMS_CusBarCodeCheckBill.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
Model/Model.csproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
Model/WMS/ClsWMS_CusBarCodeCheckBillMain.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Controllers/仓存管理/三点照合扫码记录单/WMS_CusBarCodeCheckBillController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Controllers/条码管理/WEBSController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Web.config | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/WebAPI.csproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/WebAPI.csproj.user | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
DAL/DAL.csproj
@@ -87,6 +87,7 @@ <Compile Include="ClsPM_CustomerTaskBillMain.cs" /> <Compile Include="ClsGy_MaterialMouldBillMain.cs" /> <Compile Include="ClsPM_WorkPlanMonthBillMain.cs" /> <Compile Include="WMS\ClsWMS_CusBarCodeCheckBill.cs" /> <Compile Include="è´¨æ£ç®¡ç\ClsQC_TakeSampleCheckBill.cs" /> <Compile Include="MES\ClsSc_SourceLineRepairBill.cs" /> <Compile Include="MES\ClsSc_MESMaterToSourceBill .cs" /> DAL/WMS/ClsWMS_CusBarCodeCheckBill.cs
New file @@ -0,0 +1,30 @@ using System; using System.Collections.Generic; using System.Text; using System.Data; namespace DAL { public class ClsWMS_CusBarCodeCheckBill:DBUtility.ClsXt_BaseBill { public Model.ClsWMS_CusBarCodeCheckBillMain omodel = new Model.ClsWMS_CusBarCodeCheckBillMain(); public ClsWMS_CusBarCodeCheckBill() { base.MvarItemKeySub = "WMS_CusBarCodeCheckBillSub"; base.MvarItemKeySub2 = ""; base.MvarItemKeySub3 = ""; base.MvarItemKeySub4 = ""; base.MvarItemKey="WMS_CusBarCodeCheckBillMain"; base.MvarReportTitle= "ä¸ç¹ç §åæ«ç è®°å½å"; base.BillType= "1282"; base.HBillSubType = "1282"; } } } Model/Model.csproj
@@ -138,6 +138,7 @@ <Compile Include="CRM\ClsSec_ProductRepairBillMain.cs" /> <Compile Include="CRM\ClsSec_ProductRepairBillSub.cs" /> <Compile Include="CRM\ClsSec_ProductRepairBillSub1.cs" /> <Compile Include="WMS\ClsWMS_CusBarCodeCheckBillMain.cs" /> <Compile Include="åºç¡èµæ\åºç¡èµæ\ClsGy_RestDay_Model.cs" /> <Compile Include="è´¨æ£ç®¡ç\ClsQC_TakeSampleCheckBillMain.cs" /> <Compile Include="è´¨æ£ç®¡ç\ClsQC_TakeSampleCheckBillSub.cs" /> Model/WMS/ClsWMS_CusBarCodeCheckBillMain.cs
New file @@ -0,0 +1,11 @@ using System; using System.Collections.Generic; using System.Text; namespace Model { public class ClsWMS_CusBarCodeCheckBillMain : DBUtility.ClsXt_BaseBillMain { public Int64 HDeptID;// int --é¨é¨ } } WebAPI/Controllers/²Ö´æ¹ÜÀí/ÈýµãÕÕºÏɨÂë¼Ç¼µ¥/WMS_CusBarCodeCheckBillController.cs
New file @@ -0,0 +1,340 @@ using Newtonsoft.Json; using Newtonsoft.Json.Linq; using Pub_Class; using System; using System.Collections; using System.Collections.Generic; using System.Data; using System.Data.SqlClient; using System.Web.Http; using WebAPI.Models; using System.Windows.Forms; namespace WebAPI.Controllers { public class WMS_CusBarCodeCheckBillController : ApiController { public DBUtility.ClsPub.Enum_BillStatus BillStatus; public const string ModName = "1282"; //åæ®ç±»å public const string ModCaption = "ä¸ç¹ç §åæ«ç è®°å½å"; //åæ®åç§° public const string ModRightName = "WMS_CusBarCodeCheckBill"; public const string ModRightNameList = ModRightName + "List"; //å表 public const string ModRightNameEdit = ModRightName + "_Edit"; //ç¼è¾ public const string ModRightNameCheck = ModRightName + "_Check"; //å®¡æ ¸ public const string ModRightNameClose = ModRightName + "_Close"; //å ³é public const string ModRightNameDelete = ModRightName + "_Delete"; //ä½åº public const string ModRightNameDrop = ModRightName + "_Drop"; //å é¤ public const string ModRightNameMoney = ModRightName + "_Money"; //éé¢ public const string ModRightNameQty = ModRightName + "_Qty"; //æ°é public DataSet ds = new DataSet(); private json objJsonResult = new json(); SQLHelper.ClsCN oCn = new SQLHelper.ClsCN(); public DAL.ClsWMS_CusBarCodeCheckBill oBill = new DAL.ClsWMS_CusBarCodeCheckBill(); #region ä¸ç¹ç §åæ«ç è®°å½åå表 /// <summary> /// è·åä¸ç¹ç §åæ«ç è®°å½ååè¡¨ä¿¡æ¯ /// </summary> /// <returns></returns> [Route("WMS_CusBarCodeCheckBillController/GetWMS_CusBarCodeCheckBillList_Json")] [HttpGet] public object GetWMS_CusBarCodeCheckBillList_Json(string sWhere, string HMaker, string OperationType, string ViewName) { try { List<object> columnNameList = new List<object>(); //夿æé if (OperationType == "1") { //夿æé if (!DBUtility.ClsPub.Security_Log(ModRightNameList, 3, false, HMaker)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æ¨æ²¡æè¯¥æ¨¡åæé,请ä¸ç®¡çåèç³»ï¼"; objJsonResult.data = null; return objJsonResult; } } //è¿ååè¡¨ä¿¡æ¯ ds = oCn.RunProcReturn("select * from " + ViewName + " where 1=1 " + sWhere + " order by hmainid desc", ViewName); //æ·»å åå 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 = "æåï¼"; objJsonResult.data = ds.Tables[0]; objJsonResult.list = columnNameList; return objJsonResult; } catch (Exception e) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æ¥è¯¢å表信æ¯å¤±è´¥ï¼" + e.ToString(); objJsonResult.data = null; return objJsonResult; } } #endregion #region ä¸ç¹ç §åæ«ç è®°å½å å é¤ /// <summary> /// å é¤ä¸ç¹ç §åæ«ç è®°å½å /// </summary> /// <returns></returns> [Route("WMS_CusBarCodeCheckBillController/GetWMS_CusBarCodeCheckBill_Delete_Json")] [HttpGet] public object GetWMS_CusBarCodeCheckBill_Delete_Json(Int64 HInterID, string HMaker) { try { //夿æé if (!DBUtility.ClsPub.Security_Log(ModRightNameDrop, 3, false, HMaker)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æ¨æ²¡æè¯¥æ¨¡åå é¤åè½æé,请ä¸ç®¡çåèç³»ï¼"; objJsonResult.data = null; return objJsonResult; } //夿å卿§ ds = oCn.RunProcReturn("select HBillNo from WMS_CusBarCodeCheckBillMain with(nolock) where HInterID=" + HInterID.ToString(), "WMS_CusBarCodeCheckBillMain"); if (ds == null || ds.Tables[0].Rows.Count == 0) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æªæ¥è¯¢å°è¯¥ä¸ç¹ç §åæ«ç è®°å½åï¼è¯·å·æ°æ°æ®åéæ°éæ©ï¼"; objJsonResult.data = null; return objJsonResult; } else { //å é¤åæ§å¶ DataSet BeforeDs = oCn.RunProcReturn("Exec h_p_WMS_CusBarCodeCheckBill_BeforeDelCtrl " + HInterID.ToString() + ",'" + HMaker + "'", "h_p_WMS_CusBarCodeCheckBill_BeforeDelCtrl"); if (BeforeDs == null || BeforeDs.Tables[0].Rows.Count == 0) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "å é¤åå¤æå¤±è´¥ï¼"; objJsonResult.data = null; return objJsonResult; } else { if (DBUtility.ClsPub.isLong(BeforeDs.Tables[0].Rows[0]["HBack"]) == 1) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "å é¤å¤±è´¥ï¼" + DBUtility.ClsPub.isStrNull(BeforeDs.Tables[0].Rows[0]["HRemark"]); objJsonResult.data = null; return objJsonResult; } } //å é¤åæ®ï¼å å«å é¤åæ§å¶ãåå ¥æ¥å¿ï¼ if (!oBill.DeleteBill(HInterID, DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBillNo"]), "h_p_WMS_CusBarCodeCheckBill_AfterDelCtrl", HMaker, ref ClsPub.sExeReturnInfo)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "å é¤å¤±è´¥!åå :" + ClsPub.sExeReturnInfo; objJsonResult.data = null; return objJsonResult; } else { objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "å é¤ä¸ç¹ç §åæ«ç è®°å½åæåï¼"; objJsonResult.data = null; return objJsonResult; } } } catch (Exception e) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "å é¤ä¸ç¹ç §åæ«ç è®°å½å失败ï¼" + e.ToString(); objJsonResult.data = null; return objJsonResult; } } #endregion #region ä¸ç¹ç §åæ«ç è®°å½å å®¡æ ¸/åå®¡æ ¸ /// <summary> /// å®¡æ ¸/åå®¡æ ¸ä¸ç¹ç §åæ«ç è®°å½å /// </summary> /// <param name="HInterID">åæ®ID</param> /// <param name="Type">å®¡æ ¸(1),åå®¡æ ¸(2)</param> /// <param name="HMaker">å®¡æ ¸äºº</param> /// <returns></returns> [Route("WMS_CusBarCodeCheckBillController/GetWMS_CusBarCodeCheckBill_Check_Json")] [HttpGet] public object GetWMS_CusBarCodeCheckBill_Check_Json(Int64 HInterID, int Type, string HMaker) { try { //夿æé if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 3, false, HMaker)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æ¨æ²¡æè¯¥æ¨¡åå®¡æ ¸/åå®¡æ ¸åè½æé,请ä¸ç®¡çåèç³»ï¼"; objJsonResult.data = null; return objJsonResult; } //夿å卿§ ds = oCn.RunProcReturn("select HBillNo,HChecker,HCloseMan,HDeleteMan from WMS_CusBarCodeCheckBillMain with(nolock) where HInterID=" + HInterID.ToString(), "WMS_CusBarCodeCheckBillMain"); if (ds == null || ds.Tables[0].Rows.Count == 0) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æªæ¥è¯¢å°è¯¥ä¸ç¹ç §åæ«ç è®°å½åï¼è¯·å·æ°æ°æ®åéæ°éæ©ï¼"; objJsonResult.data = null; return objJsonResult; } else { //Type 1 å®¡æ ¸ 2 åå®¡æ ¸ if (Type == 1) { if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HChecker"]).Trim() != "") { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "åæ®å·²å®¡æ ¸ï¼ä¸è½åæ¬¡å®¡æ ¸ï¼"; objJsonResult.data = null; return objJsonResult; } if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HCloseMan"]).Trim() != "") { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "åæ®å·²å ³éï¼ä¸è½åæ¬¡å®¡æ ¸ï¼"; objJsonResult.data = null; return objJsonResult; } if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HDeleteMan"]).Trim() != "") { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "忮已ä½åºï¼ä¸è½åæ¬¡å®¡æ ¸ï¼"; objJsonResult.data = null; return objJsonResult; } //å®¡æ ¸åæ§å¶ DataSet BeforeDs = oCn.RunProcReturn("Exec h_p_WMS_CusBarCodeCheckBill_BeforeCheckCtrl " + HInterID.ToString() + ",'" + HMaker + "'", "h_p_WMS_CusBarCodeCheckBill_BeforeCheckCtrl"); if (BeforeDs == null || BeforeDs.Tables[0].Rows.Count == 0) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "å®¡æ ¸åå¤æå¤±è´¥ï¼"; objJsonResult.data = null; return objJsonResult; } else { if (DBUtility.ClsPub.isLong(BeforeDs.Tables[0].Rows[0]["HBack"]) == 1) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "å®¡æ ¸å¤±è´¥ï¼" + DBUtility.ClsPub.isStrNull(BeforeDs.Tables[0].Rows[0]["HRemark"]); objJsonResult.data = null; return objJsonResult; } } //å®¡æ ¸åæ® if (!oBill.CheckBill(HInterID, DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBillNo"]), "h_p_WMS_CusBarCodeCheckBill_AfterCheckCtrl", HMaker, ref ClsPub.sExeReturnInfo)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "å®¡æ ¸å¤±è´¥!åå :" + ClsPub.sExeReturnInfo; objJsonResult.data = null; return objJsonResult; } else { objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "åæ®å·ï¼" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBillNo"]) + " å®¡æ ¸æåï¼"; objJsonResult.data = null; return objJsonResult; ; } } else { if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HChecker"]).Trim() == "") { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "åæ®æªå®¡æ ¸ï¼ä¸éè¦åå®¡æ ¸ï¼"; objJsonResult.data = null; return objJsonResult; } //åå®¡æ ¸åæ§å¶ DataSet BeforeDs = oCn.RunProcReturn("Exec h_p_WMS_CusBarCodeCheckBill_BeforeUnCheckCtrl " + HInterID.ToString() + ",'" + HMaker + "'", "h_p_WMS_CusBarCodeCheckBill_BeforeUnCheckCtrl"); if (BeforeDs == null || BeforeDs.Tables[0].Rows.Count == 0) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "åå®¡æ ¸åå¤æå¤±è´¥ï¼"; objJsonResult.data = null; return objJsonResult; } else { if (DBUtility.ClsPub.isLong(BeforeDs.Tables[0].Rows[0]["HBack"]) == 1) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "åå®¡æ ¸å¤±è´¥ï¼" + DBUtility.ClsPub.isStrNull(BeforeDs.Tables[0].Rows[0]["HRemark"]); objJsonResult.data = null; return objJsonResult; } } //åå®¡æ ¸åæ® if (!oBill.AbandonCheck(HInterID, DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBillNo"]), "h_p_WMS_CusBarCodeCheckBill_AfterUnCheckCtrl", HMaker, ref ClsPub.sExeReturnInfo)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "åå®¡æ ¸å¤±è´¥!åå :" + ClsPub.sExeReturnInfo; objJsonResult.data = null; return objJsonResult; } else { objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "åæ®å·ï¼" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBillNo"]) + " åå®¡æ ¸æåï¼"; objJsonResult.data = null; return objJsonResult; ; } } } } catch (Exception e) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "å®¡æ ¸æåå®¡æ ¸ä¸ç¹ç §åæ«ç è®°å½å失败ï¼" + e.ToString(); objJsonResult.data = null; return objJsonResult; } } #endregion } } WebAPI/Controllers/ÌõÂë¹ÜÀí/WEBSController.cs
@@ -6569,6 +6569,269 @@ #endregion #region ä¸ç¹ç §åæ«ç è®°å½å模åè°ç¨æ¹æ³ 20240723 #region ä¸ç¹ç §åæ«ç è®°å½åæ«ç æ¨¡å æ«æå®¢æ·æ¡ç è°ç¨æ¹æ³ /// <summary> /// æ«æå®¢æ·æ¡ç /// </summary> /// <returns></returns> [Route("WEBSController/Get_CusBarCode_CusBarCodeCheck_Json")] [HttpGet] public object Get_CusBarCode_CusBarCodeCheck_Json(string HCusBarCode_Y, string HCusBarCode_N) { try { ds = oCn.RunProcReturn("exec h_p_WMS_CheckCusBarCode_CusBarCodeCheck '" + HCusBarCode_Y + "','" + HCusBarCode_N + "'", "h_p_WMS_CheckCusBarCode_CusBarCodeCheck"); if (ds == null || ds.Tables[0].Rows.Count == 0) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æ«æå®¢æ·æ¡ç 夿é误ï¼"; objJsonResult.data = null; return objJsonResult; } else if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) == 1) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]); objJsonResult.data = null; return objJsonResult; } else { objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "æåï¼"; 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 #region ä¸ç¹ç §åæ«ç è®°å½åæ«ç æ¨¡å æ«æç©ææ¡ç è°ç¨æ¹æ³ /// <summary> /// æ«æç©ææ¡ç /// </summary> /// <returns></returns> [Route("WEBSController/Get_BarCode_CusBarCodeCheck_Json")] [HttpGet] public object Get_BarCode_CusBarCodeCheck_Json(string HBarCode, string HCusBarCode_Y, string HCusBarCode_N, Int64 HInterID, string HBillType, string HBillNo, string HMaker, Int64 HStockOrgID) { try { ds = oCn.RunProcReturn("exec h_p_WMS_AddBarCode_CusBarCodeCheck " + HInterID.ToString() + ",'" + HBillNo + "','" + HBillType + "','" + HBarCode + "','" + HCusBarCode_Y + "','" + HCusBarCode_N + "','" + HMaker + "'," + HStockOrgID.ToString(), "h_p_WMS_AddBarCode_CusBarCodeCheck"); if (ds == null || ds.Tables[0].Rows.Count == 0) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æ«æç©ææ¡ç ï¼åå ¥ä¸´æ¶è¡¨å¤±è´¥ï¼"; objJsonResult.data = null; return objJsonResult; } else if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) == 1) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]); objJsonResult.data = null; return objJsonResult; } else { objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "æåï¼"; 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 #region ä¸ç¹ç §åæ«ç è®°å½åæ«ç 模å è·åæ«ç 模åå表信æ¯è°ç¨æ¹æ³ /// <summary> /// è·åæ«ç 模ååè¡¨ä¿¡æ¯ /// </summary> /// <returns></returns> [Route("WEBSController/GetCusBarCodeCheckBillTmpList_Json")] [HttpGet] public object GetCusBarCodeCheckBillTmpList_Json(Int64 HInterID, string HBillNo, string HBillType) { try { ds = oCn.RunProcReturn("exec h_p_WMS_CusBarCodeCheckBillTmpList " + HInterID.ToString() + ",'" + HBillType + "'", "h_p_WMS_CusBarCodeCheckBillTmpList"); if (ds == null || ds.Tables[0].Rows.Count == 0) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "没æè¿åä»»ä½è®°å½ï¼"; objJsonResult.data = null; return objJsonResult; } else { List<object> columnNameList = new List<object>(); //æ·»å åå 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 = "è·åä¿¡æ¯æåï¼"; objJsonResult.data = ds.Tables[0]; objJsonResult.list = columnNameList; return objJsonResult; } } catch (Exception e) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "è·åå表信æ¯å¤±è´¥ï¼" + e.ToString(); objJsonResult.data = null; return objJsonResult; } } #endregion #region ä¸ç¹ç §åæ«ç è®°å½åæ«ç 模å å é¤åè½æé®è°ç¨ å é¤éä¸è¡ä¸´æ¶è¡¨è®°å½ /// <summary> /// å é¤éä¸è¡ä¸´æ¶è¡¨è®°å½ /// </summary> /// <returns></returns> [Route("WEBSController/set_DelCusBarCodeCheckBill_temp_Json")] [HttpGet] public object set_DelCusBarCodeCheckBill_temp_Json(Int64 HInterID, string HBillType, Int64 HItemID) { try { oCn.RunProc("Delete from WMS_CusBarCodeCheckBill_temp where HInterID=" + HInterID.ToString() + " and HBillType='" + HBillType + " and HItemID=" + HItemID.ToString(), ref DBUtility.ClsPub.sExeReturnInfo); objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "å 餿å"; objJsonResult.data = null; return objJsonResult; } catch (Exception e) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "å 餿«ç è®°å½å¤±è´¥ï¼" + e.ToString(); objJsonResult.data = null; return objJsonResult; } } #endregion #region ä¸ç¹ç §åæ«ç è®°å½å ä¸ä¼ çå /// <summary> /// ä¸ç¹ç §åæ«ç è®°å½åæ°å¢ä¸ä¼ /// </summary> /// <returns></returns> [Route("WEBSController/set_SaveCusBarCodeCheckBill_Json")] [HttpPost] public object set_SaveCusBarCodeCheckBill_Json([FromBody] JObject oMain) { var _value = oMain["oMain"].ToString(); string msg1 = _value.ToString(); try { string sMainStr = "[" + msg1.ToString() + "]"; List<Model.ClsWMS_CusBarCodeCheckBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsWMS_CusBarCodeCheckBillMain>>(sMainStr); Model.ClsWMS_CusBarCodeCheckBillMain omodel = new Model.ClsWMS_CusBarCodeCheckBillMain(); omodel.HInterID = mainList[0].HInterID; omodel.HBillNo = mainList[0].HBillNo; omodel.HBillType = mainList[0].HBillType; omodel.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString()); omodel.HRemark = mainList[0].HRemark; omodel.HMaker = mainList[0].HMaker; omodel.HSTOCKORGID = mainList[0].HSTOCKORGID; omodel.HDeptID = mainList[0].HDeptID; //夿ä¼è®¡ææ¯å¦åç string s = ""; int sYear = 0; int sPeriod = 0; if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(DateTime.Today, ref sYear, ref sPeriod, ref s) == false) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = s; objJsonResult.data = null; return objJsonResult; } else { omodel.HYear = sYear; omodel.HPeriod = sPeriod; } oCn.BeginTran(); //çæä¸ç¹ç §åæ«ç è®°å½å //æå ¥å表 oCn.RunProc("EXEC h_p_WMS_CusBarCodeCheckBillSub_Insert " + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "'"); //æå ¥ä¸»è¡¨ oCn.RunProc("Insert Into WMS_CusBarCodeCheckBillMain " + "(HBillType,HBillSubType,HInterID,HBillNo,HDate" + ",HYear,HPeriod,HRemark,HMaker,HMakeDate" + ",HDeptID,HStockOrgID" + ") " + " values('" + omodel.HBillType + "','" + omodel.HBillType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate.ToShortDateString() + "'" + ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HMaker + "',getdate()" + ", " + omodel.HDeptID.ToString() + "," + omodel.HSTOCKORGID.ToString() + ") "); oCn.Commit(); objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "çæä¸ç¹ç §åæ«ç è®°å½åæåï¼åæ®å·ä¸ºï¼" + omodel.HBillNo; objJsonResult.data = null; return objJsonResult; } catch (Exception e) { oCn.RollBack(); objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "ä¸ç¹ç §åæ«ç è®°å½åä¸ä¼ 失败ï¼" + e.Message; objJsonResult.data = null; return objJsonResult; } } #endregion #endregion #region ç©ææ¡ç æ¥è¯¢è°ç¨æ¹æ³ /// <summary> /// è·åæ¡ç ä¿¡æ¯ WebAPI/Properties/PublishProfiles/FolderProfile.pubxml
@@ -10,7 +10,7 @@ <LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration> <LastUsedPlatform>x86</LastUsedPlatform> <PublishProvider>FileSystem</PublishProvider> <PublishUrl>G:\issWeb\ç½ç«åå¸\API</PublishUrl> <PublishUrl>D:\ç½ç«åå¸\æºäºMESWMS\API</PublishUrl> <WebPublishMethod>FileSystem</WebPublishMethod> <SiteUrlToLaunchAfterPublish /> </PropertyGroup> WebAPI/Web.config
@@ -22,7 +22,7 @@ <!--<add key="FileIP" value="http://localhost:8082/LuBaoAPI"/>--> <!--<add key="FileIP" value="http://localhost:8080/" />--> <!--<add key="sUrl" value="http://183.129.128.86:9090/WEBS-WMSTest/WebService1.asmx"/> --> <!--<add key="sUrl" value="http://192.168.0.81/WEBS-WMS/WebService1.asmx"/> --><!--é¢å°å¼æº--> <add key="sUrl" value="http://192.168.0.81/WEBS-WMS/WebService1.asmx"/><!--é¢å°å¼æº--> <!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> å¤å®--> <!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> --> <!--<add key="sUrl" value="http://10.10.130.181/WEBS-WMS/WebService1.asmx"/> åæ¥ç§æ--> @@ -35,7 +35,7 @@ <!--<add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx"/> --> <!--æµè¯æå¡å¨--> <!--<add key="surl" value="http://localhost:8082/webs/webservice1.asmx"/> æ¬å°--> <!--<add key="sUrl" value="http://192.168.110.57:81/WEBS/WebService1.asmx"/>--> <!--éé¯éæ¬å°é ç½®--> <add key="surl" value="http://localhost/webs-web/webservice1.asmx"/> <!--ç¿æ¶æ¶æ¬å°é ç½®--> <!--<add key="surl" value="http://localhost/webs-web/webservice1.asmx"/>--> <!--ç¿æ¶æ¶æ¬å°é ç½®--> <!--<add key="sUrl" value="http://192.168.1.57:8082/WEBS-WMS/WebService1.asmx"/>ä¹è±--> <!--<add key="sUrl" value="http://61.130.182.102:18181/WEBSCS/WebService1.asmx"/>--><!--æ¯è«å°--> WebAPI/WebAPI.csproj
@@ -516,6 +516,7 @@ <Compile Include="Controllers\人äºç®¡ç\å¼å¸¸åé¦å\OA_ErrMsgBackBillController.cs" /> <Compile Include="Controllers\人äºç®¡ç\离èç³è¯·\HR_EmpDimissionBillController.cs" /> <Compile Include="Controllers\人äºç®¡ç\èåå¼å¨å\HR_EmpChangeBillController.cs" /> <Compile Include="Controllers\ä»å管ç\ä¸ç¹ç §åæ«ç è®°å½å\WMS_CusBarCodeCheckBillController.cs" /> <Compile Include="Controllers\ä»å管ç\å§å¤ç¨æ\WW_PPBomBillController.cs" /> <Compile Include="Controllers\ä»å管ç\æ«ç å¼å¸¸è®°å½\KF_PonderationBillController.cs" /> <Compile Include="Controllers\ä»å管ç\æ¡ç åºå ¥åºè®°å½\Kf_ICStockInOutBillController.cs" /> WebAPI/WebAPI.csproj.user
@@ -9,7 +9,7 @@ <WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected> <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>D:\Git\houduan\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\æºäºè¿æ\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>D:\GITä»åº\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile> <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> <UseIISExpress>true</UseIISExpress> <Use64BitIISExpress />