1

duhe

2023-11-24 a811e1258b165f4ffa02c8fe1d46836a1927a8f4

 WebAPI/Controllers/MoveStockBillController.cs

@@ -46,6 +46,7 @@
        public ClsKF_PonderationBillMain_Temp model = new ClsKF_PonderationBillMain_Temp();
        private JsonResult objJsonResult = new JsonResult();
        private json objjson = new json();
        private object oCn;

        /// <summary>
        /// 调拨单/返回出入库条码临时表/直接调用webservice
@@ -542,8 +543,11 @@
            WebS.WebService1 oWebs = new WebS.WebService1();
            WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS();
            string sExpressNumber = "";

            var sJXCode = POStockInBillController.JX_Json(sCode, sInterID, HBillType, HStockOutOrgID, sBillNo,sMaker);
            //WebSoBar = oWebs.get_CheckTypeByBarCode_All(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo);
            WebSoBar = oWebs.get_BarCode_MoveStock(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, HSCWhID, HSCSPID, sQty, SourceFlag, sSourceBillNo, sHSourceBillType, HStockInOrgID,HStockOutOrgID,HScanStyle, ref DBUtility.ClsPub.sErrInfo);
            string HCustom1 = "", HCustom2 = "";
            WebSoBar = oWebs.get_BarCode_MoveStock(sJXCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, HSCWhID, HSCSPID, sQty, SourceFlag, sSourceBillNo, sHSourceBillType, HStockInOrgID,HStockOutOrgID,HScanStyle, ref DBUtility.ClsPub.sErrInfo, HCustom1, HCustom2);
            if (WebSoBar == null)
            {
                objJsonResult.code = "0";
@@ -572,6 +576,10 @@
        {
            var _value = oMain["oMain"].ToString();
            string msg1 = _value.ToString();


          

            //List<Model.ClsKf_MoveStockBillMain> lsmain = new List<Model.ClsKf_MoveStockBillMain>();
            //ListModels oListModels = new ListModels();
            //lsmain = oListModels.getMoveStockBillMainByJson(msg1);
@@ -607,18 +615,50 @@
                websLsmain.HBillerID = 0;
                websLsmain.HExplanation = "";
                websLsmain.HInnerBillNo = "";
                websLsmain.HRedBlueFlag = true;
                websLsmain.HRedBlueFlag = false;
                websLsmain.HMainSourceBillType = "-1";
                websLsmain.HStockStyle = "";
                websLsmain.HBillType = "1207";
                websLsmain.HBillSubType = lsmain[0].HBillSubType;
                websLsmain.HSupID = 0;
                //websLsmain.HGroupID = lsmain[0].HGroupID;
                string sErrMsg = "";
                ////上传前判断
                //SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
                //DataSet Ds = oCn.RunProcReturn("exec h_p_WMS_BeforeUpload_MoveStockBill_AR " + websLsmain.HInterID.ToString() + ",'" + websLsmain.HBillNo + "','" + websLsmain.HBillType + "'", "h_p_WMS_BeforeUpload_MoveStockBill_AR");
                //if (Ds == null || Ds.Tables[0].Rows.Count == 0)
                //{
                //    sErrMsg = "校验上传前判断，发生错误！"; 
                //    //return false;

                //    objJsonResult.code = "99";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "上传失败！" + sErrMsg;
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                //else
                //{
                //    if (DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0][0]) == 1)
                //    {
                //        sErrMsg = "单据号：" + websLsmain.HBillNo + "，单据ID：" + websLsmain.HInterID + "；" + DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark"]);
                //        //return false;
                //        objJsonResult.code = "99";
                //        objJsonResult.count = 0;
                //        objJsonResult.Message = "上传失败！" + sErrMsg;
                //        objJsonResult.data = null;
                //        return objJsonResult;

                //    }
                //}



                if (webserver.set_SaveMoveStockBill(websLsmain, sSourceBillType, ref DBUtility.ClsPub.sErrInfo))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
                    objJsonResult.Message = DBUtility.ClsPub.sErrInfo;  //成功！
                    objJsonResult.data = null;
                    return objJsonResult;
                }
@@ -626,7 +666,8 @@
                {
                    objJsonResult.code = "99";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "上传失败！" + DBUtility.ClsPub.sErrInfo;
                    objJsonResult.Message = DBUtility.ClsPub.sErrInfo;  //失败！
                    //objJsonResult.Message = "上传失败！" + DBUtility.ClsPub.sErrInfo;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
@@ -641,6 +682,123 @@
                return objJsonResult;
            }
        }



        /// <summary>
        /// 安瑞盘点单
        /// </summary>
        /// <returns></returns>
        //[Route("MoveStockBill/set_SaveMoveStockBill_PD")]
        //[HttpPost]
        //public object set_SaveMoveStockBill_PD([FromBody] JObject oMain)
        //{
        //    var _value = oMain["oMain"].ToString();
        //    string msg1 = _value.ToString();




        //    //List<Model.ClsKf_MoveStockBillMain> lsmain = new List<Model.ClsKf_MoveStockBillMain>();
        //    //ListModels oListModels = new ListModels();
        //    //lsmain = oListModels.getMoveStockBillMainByJson(msg1);
        //    //lsmain[0].HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
        //    //lsmain[0].HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
        //    //string sSourceBillType = lsmain[0].HBillType;
        //    //BLL.ClsKf_MoveStockBill bll = new BLL.ClsKf_MoveStockBill();
        //    //return bll.set_SaveMoveStockBill(lsmain[0], sSourceBillType, ref DBUtility.ClsPub.sErrInfo);
        //    try
        //    {
        //        List<Model.ClsKf_MoveStockBillMain> lsmain = new List<Model.ClsKf_MoveStockBillMain>();
        //        ListModels oListModels = new ListModels();
        //        lsmain = oListModels.getMoveStockBillMainByJson(msg1);
        //        lsmain[0].HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
        //        lsmain[0].HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
        //        string sSourceBillType = lsmain[0].HBillType;
        //        //string sSourceBillType = "-1";


        //        WebAPI.WebS.ClsKf_MoveStockBillMain websLsmain = new WebS.ClsKf_MoveStockBillMain();
        //        websLsmain.HInterID = lsmain[0].HInterID;
        //        websLsmain.HDate = lsmain[0].HDate;
        //        websLsmain.HBillNo = lsmain[0].HBillNo;
        //        websLsmain.HDeptID = lsmain[0].HDeptID;
        //        websLsmain.HEmpID = lsmain[0].HEmpID;
        //        websLsmain.HRemark = lsmain[0].HRemark;
        //        websLsmain.HMaker = lsmain[0].HMaker;
        //        websLsmain.HWHID = lsmain[0].HWHID;
        //        websLsmain.HSCWHID = lsmain[0].HSCWHID;
        //        websLsmain.HKeeperID = lsmain[0].HKeeperID;
        //        websLsmain.HSecManagerID = lsmain[0].HSecManagerID;
        //        websLsmain.HManagerID = 0;
        //        websLsmain.HBillerID = 0;
        //        websLsmain.HExplanation = "";
        //        websLsmain.HInnerBillNo = "";
        //        websLsmain.HRedBlueFlag = true;
        //        websLsmain.HMainSourceBillType = "-1";
        //        websLsmain.HStockStyle = "";
        //        websLsmain.HBillType = "1207";
        //        websLsmain.HSupID = 0;
        //        //websLsmain.HGroupID = lsmain[0].HGroupID;
        //        //string sErrMsg = "";
        //        //上传前判断
        //        //SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
        //        //DataSet Ds = oCn.RunProcReturn("exec h_p_WMS_BeforeUpload_MoveStockBill_AR " + websLsmain.HInterID.ToString() + ",'" + websLsmain.HBillNo + "','" + websLsmain.HBillType + "'", "h_p_WMS_BeforeUpload_MoveStockBill_AR");
        //        //if (Ds == null || Ds.Tables[0].Rows.Count == 0)
        //        //{
        //        //    sErrMsg = "校验上传前判断，发生错误！";
        //        //    //return false;

        //        //    objJsonResult.code = "99";
        //        //    objJsonResult.count = 0;
        //        //    objJsonResult.Message = "上传失败！" + sErrMsg;
        //        //    objJsonResult.data = null;
        //        //    return objJsonResult;
        //        //}
        //        //else
        //        //{
        //        //    if (DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0][0]) == 1)
        //        //    {
        //        //        sErrMsg = "单据号：" + websLsmain.HBillNo + "，单据ID：" + websLsmain.HInterID + "；" + DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark"]);
        //        //        //return false;
        //        //        objJsonResult.code = "99";
        //        //        objJsonResult.count = 0;
        //        //        objJsonResult.Message = "上传失败！" + sErrMsg;
        //        //        objJsonResult.data = null;
        //        //        return objJsonResult;

        //        //    }
        //        //}



        //        if (webserver.set_SaveMoveStockBill_PD(websLsmain, sSourceBillType, ref DBUtility.ClsPub.sErrInfo))
        //        {
        //            objJsonResult.code = "0";
        //            objJsonResult.count = 1;
        //            objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
        //            objJsonResult.data = null;
        //            return objJsonResult;
        //        }
        //        else
        //        {
        //            objJsonResult.code = "99";
        //            objJsonResult.count = 0;
        //            objJsonResult.Message = "上传失败！" + DBUtility.ClsPub.sErrInfo;
        //            objJsonResult.data = null;
        //            return objJsonResult;
        //        }
        //    }
        //    catch (Exception e)
        //    {

        //        objJsonResult.code = "3";
        //        objJsonResult.count = 0;
        //        objJsonResult.Message = "上传失败！" + e.ToString();
        //        objJsonResult.data = null;
        //        return objJsonResult;
        //    }
        //}



@@ -700,7 +858,8 @@
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "生成调拨单成功！单据号为：";
                    objJsonResult.Message = DBUtility.ClsPub.sErrInfo;  //成功！
                    //objJsonResult.Message = "生成调拨单成功！单据号为：";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
@@ -708,7 +867,8 @@
                {
                    objJsonResult.code = "99";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "上传失败！" + DBUtility.ClsPub.sErrInfo;
                    objJsonResult.Message = DBUtility.ClsPub.sErrInfo;  //失败！
                    //objJsonResult.Message = "上传失败！" + DBUtility.ClsPub.sErrInfo;
                    objJsonResult.data = null;
                    return objJsonResult;
                }