parent: 9adda812 | 补丁 | 提交 | show whitespace
1
yangle
2022-12-09 7b013346174c6f645039ea7673a666a3228cf20b 
1
3个文件已修改
41 ■■■■■ 已修改文件
WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/基础资料/基础资料/Gy_StockCheckItemBillController.cs 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Models/Cls_InventoryAnalysisList.cs 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs


@@ -215,6 +215,7 @@


                    objJsonResult.data = null;


                    return objJsonResult;


                }




                //if (HWorkTimes <= 0)


                //{


                //    objJsonResult.code = "0";


@@ -255,10 +256,13 @@


                //    objJsonResult.data = null;


                //    return objJsonResult;


                //}


                var num = 0;




                //若MAINDI重复则重新获取


                oCN.BeginTran();


                if ("Add".Equals(eventType))


                {


                    num = 1;


                    if (!AllowbillNo(HBillNo))


                    {


                        oCN.RollBack();


@@ -290,6 +294,7 @@


                }


                else if ("Modify".Equals(eventType))


                {


                    num = 2;


                    oCN.RunProc("UpDate Sc_StationOutBillMain set  " +


                    "HUpDater='" + HMaker + "'" +


                    ",HUpDateDate=getdate()" +


@@ -358,7 +363,7 @@


                    objJsonResult.data = null;


                    return objJsonResult;


                }


                oCN.RunProc("exec h_p_Mes_ProcessExchangeRelationQty_Out " + HInterID + ",1");


                oCN.RunProc("exec h_p_Mes_ProcessExchangeRelationQty_Out " + HInterID + ","+ num + "");


                oCN.RunProc("exec h_p_Mes_ProcessExchangeChangeStatus  " + HInterID + " ");


                oCN.RunProc("exec h_p_Mes_StationOutBillBackBarCode  " + HInterID + " ");


                //判断是否是 æœ«é“工序 


@@ -394,6 +399,7 @@


            }


            catch (Exception e)


            {


                oCN.RollBack();


                objJsonResult.code = "0";


                objJsonResult.count = 0;


                objJsonResult.Message = "Exception！" + e.ToString();




 WebAPI/Controllers/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_StockCheckItemBillController.cs


@@ -385,22 +385,13 @@


            {


                ds = MouldStockBillMainTemp(sWhere);




                //if (ds.Tables[0].Rows.Count != 0 || ds != null)


                //{


              


                objJsonResult.code = "1";


                objJsonResult.count = 1;


                objJsonResult.Message = "Sucess！";


                objJsonResult.data = ds.Tables[0];


                return objJsonResult;


                //}


                //else


                //{


                //objJsonResult.code = "0";


                //objJsonResult.count = 0;


                //objJsonResult.Message = "无数据";


                //objJsonResult.data = null;


                //return objJsonResult;


                //}


             


            }


            catch (Exception ex)


            {


@@ -660,7 +651,7 @@


                string userID = sArray[2].ToString();//userID


                string sName = sArray[3].ToString();//盘点方案


                //查询盘点方案创建日期


                DataSet dd = oCn.RunProcReturn("select * from Gy_StockCheckItem where HName=" + sName, "Gy_StockCheckItem");


                DataSet dd = oCn.RunProcReturn("select * from Gy_StockCheckItem where HName='" + sName+"'", "Gy_StockCheckItem");


                string HDate = dd.Tables[0].Rows[0]["HMakeTime"].ToString();








 WebAPI/Models/Cls_InventoryAnalysisList.cs


@@ -7,14 +7,14 @@


{


    public class Cls_InventoryAnalysisList


    {


        public long HItemID;


        public string HBarCode;


        public string HMouldNo;


        public string HStockCheck;


        public string HRealPotType;


        public string HRealPot;


        public string HBookPotType;


        public string HBookPot;


        public string HMakeDate;


        public long HItemID { get; set; }


        public string HBarCode{ get; set; }


        public string HMouldNo{ get; set; }


        public string HStockCheck{ get; set; }


        public string HRealPotType{ get; set; }


        public string HRealPot{ get; set; }


        public string HBookPotType{ get; set; }


        public string HBookPot{ get; set; }


        public string HMakeDate{ get; set; }


    }


}