职员异动单：添加子表重复校验，子表做颜色区分，子表单元格根据宽度隐藏内容，取消分页，添加合计行，取消上一行下一行，职员带出原岗位、原班组、原部门

duhe

2023-08-15 ea265f82980af78b21ff611456bde1ab3d2bf7a9

 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
@@ -208,7 +209,7 @@
        //}

        /// <summary>
        /// 调拨单/扫条码
        /// 调拨单/扫条码         （20220618备份老方法）
        /// </summary>
        /// <param name="sCode"></param>
        /// <param name="sInterID"></param>
@@ -221,170 +222,347 @@
        /// <returns></returns>
        [Route("MoveStockBill/get_InfoByBarCode_Source_Json")]
        [HttpGet]
        public object get_InfoByBarCode_Source_Json(string sCode, Int64 sInterID, string sBillNo, Double sQty, Int64 HWHID, Int64 HSPID, Int64 SCWhID, Int64 SCSPID, string HMaker, Int64 HOrgID)
        //public object get_InfoByBarCode_Source_Json(string sCode, Int64 sInterID, string sBillNo, Double sQty, Int64 HWHID, Int64 HSPID, Int64 SCWhID, Int64 SCSPID, string HMaker, Int64 HOrgID,string HSourceBillNo,string HSourceBillType)
        //{
        //    try
        //    {
        //        DAL.ClsGy_BarCodeBill_View dal = new DAL.ClsGy_BarCodeBill_View();
        //        SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
        //        dal.GetInfoByNumber_View(sCode);



        //        if (dal.omodel_View.HBarCodeType != "托盘条码")
        //        {
        //            if (HSourceBillNo == null)
        //            {
        //                HSourceBillNo = "";
        //            }
        //            return get_InfoByBarCode_Source_Json_s(sCode, sInterID, sBillNo, sQty, HWHID, HSPID, SCWhID, SCSPID, HMaker, HOrgID, HSourceBillNo, HSourceBillType);
        //        }
        //        else
        //        {
        //            //如果是雅琪诺则托盘条码分解并模拟扫码

        //            //分解托条码得到明细条码信息写入出入库条码临时表
        //            DataSet dsTBarCode;
        //            string sBarCode_MX;
        //            dsTBarCode = oCn.RunProcReturn("select b.HBarCode HBarCodeMX from Sc_PackUnionBillMain a  " +
        //            " inner join Sc_PackUnionBillSub b on a.HInterID = b.HInterID " +
        //            " Where a.HBarCode_Pack = '" + sCode + "'", "Sc_PackUnionBillMain");
        //            if (dsTBarCode == null || dsTBarCode.Tables[0].Rows.Count == 0)
        //            {
        //                //sErrMsg = "没有找到托盘条码！";
        //                objJsonResult.code = "0";
        //                objJsonResult.count = 0;
        //                objJsonResult.Message = "扫码失败！没有找到托盘条码！";
        //                objJsonResult.data = null;
        //                return objJsonResult;
        //            }
        //            else
        //            {
        //                for (int i = 0; i < dsTBarCode.Tables[0].Rows.Count; i++)
        //                {
        //                    //sBarCode_MX = DBUtility.ClsPub.isStrNull(dsTBarCode.Tables[0].Rows[i]["HBarCodeMX"]);
        //                    sCode = DBUtility.ClsPub.isStrNull(dsTBarCode.Tables[0].Rows[i]["HBarCodeMX"]);
        //                    //objJsonResult = (JsonResult)get_InfoByBarCode_Source_Json_s(sBarCode_MX, sInterID, sBillNo, sQty, HWHID, HSPID, SCWhID, SCSPID, HMaker,HOrgID,HSourceBillNo,HSourceBillType);
        //                    objJsonResult = (JsonResult)get_InfoByBarCode_Source_Json_s(sCode, sInterID, sBillNo, sQty, HWHID, HSPID, SCWhID, SCSPID, HMaker, HOrgID, HSourceBillNo, HSourceBillType);
        //                    if (objJsonResult.code == "0")
        //                    {
        //                        return objJsonResult;
        //                    }
        //                }
        //                return objJsonResult;
        //            }
        //        }

        //    }
        //    catch (Exception e)
        //    {
        //        objJsonResult.code = "0";
        //        objJsonResult.count = 0;
        //        objJsonResult.Message = "扫码失败！" + DBUtility.ClsPub.isStrNull(e);
        //        objJsonResult.data = null;
        //        return objJsonResult;
        //    }
        //}

        //public object get_InfoByBarCode_Source_Json_s(string sCode, Int64 sInterID, string sBillNo, Double sQty, Int64 HWHID, Int64 HSPID, Int64 SCWhID, Int64 SCSPID, string HMaker,Int64 HOrgID,string HSourceBillNo,string HSourceBillType)
        //{
        //    try
        //    {
        //        WebS.ClsKF_PonderationBillMain_Temp model = new WebS.ClsKF_PonderationBillMain_Temp();
        //        string sErrMsg = "";
        //        bool sBool = false;
        //        double sRelQty = 0;
        //        int sRow = 0;
        //        long sHMaterID = 0;
        //        long sHAuxPropID = 0;

        //        string[] NewBarCode;
        //        if (sCode.CompareTo("#") > 0)
        //        {
        //            NewBarCode = sCode.Split(Convert.ToChar("#"));
        //            sCode = NewBarCode[0];
        //        }

        //        string sBarCode = sCode.Trim();
        //        string sBarCodePrefix = sBarCode.Substring(0, Math.Min(3, sBarCode.Length));//截取条码前三位字符串

        //        WebS.ClsGy_BarCodeBill_WMS_Model_View oView = new WebS.ClsGy_BarCodeBill_WMS_Model_View();
        //        WebS.WebService1 oWebs1 = new WebS.WebService1();
        //        oView = oWebs1.get_InfoByBarCode_Source(sCode, sInterID, ref sBool, ref sErrMsg);
        //        //oView = webserver.get_InfoByBarCode_Source(sCode, sInterID, ref sBool, ref DBUtility.ClsPub.sErrInfo);
        //        if (oView == null)
        //        {
        //            objJsonResult.code = "0";
        //            objJsonResult.count = 0;
        //            objJsonResult.Message = "1-单据号：" + sBillNo + "，单据ID：" + sInterID + "；" + DBUtility.ClsPub.sErrInfo;
        //            objJsonResult.data = null;
        //            return objJsonResult;
        //        }
        //        else { 
        //        if (HSourceBillNo.Trim() != "")
        //        {
        //            if (sBool == false)
        //            {
        //                objJsonResult.code = "0";
        //                objJsonResult.count = 0;
        //                objJsonResult.Message = "1-单据号：" + sBillNo + "，单据ID：" + sInterID + "该物料并不存在于此调拨单,请确认物料无误后重新扫描！";
        //                objJsonResult.data = null;
        //                return objJsonResult;
        //            }
        //        }
        //        if (oView.HBarCodeType != "托盘条码")
        //        {
        //            if (oView.HBarCodeType == "唯一条码" && sQty > 0 && oView.HQty < sQty)
        //            {
        //                sRelQty = oView.HQty;
        //            }
        //            else if (sQty > 0)
        //            {
        //                sRelQty = sQty;
        //            }
        //            else
        //            {
        //                sRelQty = oView.HQty;
        //            }
        //            if (oView.HBarCodeType != "唯一条码")
        //            {
        //                if (SCWhID == 0)
        //                {
        //                    objJsonResult.code = "0";
        //                    objJsonResult.count = 0;
        //                    objJsonResult.Message = "调出仓库没有选择！";
        //                    objJsonResult.data = null;
        //                    return objJsonResult;
        //                }
        //                else
        //                {
        //                    if (SCSPID == 0)
        //                    {
        //                        objJsonResult.code = "0";
        //                        objJsonResult.count = 0;
        //                        objJsonResult.Message = "调出仓位没有选择！";
        //                        objJsonResult.data = null;
        //                        return objJsonResult;
        //                    }
        //                }
        //            }

        //            //if (webserver.set_SavePonderationBillMain_Temp_Qty(model, sQty, ref DBUtility.ClsPub.sErrInfo))
        //            bool flag = oWebs1.Get_CheckQtyByBarCode_GetWhAndSP(model.HInterID, model.HBillType, oView.HBarCode, ref SCWhID, ref SCSPID, sRelQty, ref sRelQty);
        //            if (flag)
        //            {
        //                //sQty = sRelQty;
        //                model.HSCWHID = SCWhID;
        //                model.HOutStockPlaceID = SCSPID;
        //                if (SCWhID <= 0)
        //                {
        //                    objJsonResult.code = "0";
        //                    objJsonResult.count = 0;
        //                    objJsonResult.Message = "1-仓库无库存！";
        //                    objJsonResult.data = null;
        //                    return objJsonResult;
        //                }
        //            }
        //            else if (sRelQty == 0)
        //            {
        //                objJsonResult.code = "0";
        //                objJsonResult.count = 0;
        //                objJsonResult.Message = "2-无库存！";
        //                objJsonResult.data = null;
        //                return objJsonResult;
        //            }
        //        }
        //     }

        //        model.HInterID = DBUtility.ClsPub.isLong(sInterID);
        //        model.HBillNo = DBUtility.ClsPub.isStrNull(sBillNo);
        //        model.HBillType = this.HBillType;
        //        model.HMaker = HMaker;
        //        //
        //        model.HMaterID = oView.HMaterID;
        //        model.HAuxPropID = oView.HAuxPropID;
        //        model.HErpClsID = oView.HErpClsID;
        //        model.HQty = oView.HQty;
        //        model.HQtyMust = oView.HinitQty;
        //        model.HBarCode = oView.HBarCode;
        //        model.HBatchNo = oView.HBatchNo;
        //        model.HMTONo = oView.HMTONo;

        //        model.HWhID = DBUtility.ClsPub.isLong(HWHID);
        //        model.HStockPlaceID = DBUtility.ClsPub.isLong(HSPID);
        //        model.HSCWHID = SCWhID;
        //        model.HOutStockPlaceID = SCSPID;
        //        //model.HVDAPack = txtHVDAPack2.Text.Trim();
        //        //model.HVDAMaterNum = txtHVDAMaterID.Text.Trim();
        //        //model.HVDAQty = DBUtility.ClsPub.ObjToDouble(txtHVDAQty.Text.Trim());
        //        //
        //        model.HSourceInterID = oView.HSourceInterID;
        //        model.HSourceEntryID = oView.HSourceEntryID;
        //        model.HSourceBillNo = oView.HSourceBillNo;
        //        model.HSourceBillType = oView.HSourceBillType;
        //        model.HRedBlueFlag = false;
        //        model.HPieceQty = 1;
        //        model.HSTOCKORGID = HOrgID;
        //        model.HOWNERID = HOrgID;
        //        if(sBool)
        //        {
        //            model.HSourceBillType = HSourceBillType;
        //        }
        //        if(oWebs1.Get_CheckWhAndSP_BeUpdate(SCWhID,SCSPID,ref DBUtility.ClsPub.sErrInfo))
        //        {

        //        }
        //        else
        //        {
        //            objJsonResult.code = "0";
        //            objJsonResult.count = 0;
        //            objJsonResult.Message = "1-单据号：" + sBillNo + "，单据ID：" + sInterID + "；调出仓库," + DBUtility.ClsPub.sErrInfo;
        //            objJsonResult.data = null;
        //            return objJsonResult;
        //        }
        //        if(model.HWhID == 0)
        //        {
        //            objJsonResult.code = "0";
        //            objJsonResult.count = 0;
        //            objJsonResult.Message = "1-单据号：" + sBillNo + "，单据ID：" + sInterID + "；调入仓库没有选择！" + DBUtility.ClsPub.sErrInfo;
        //            objJsonResult.data = null;
        //            return objJsonResult;
        //        }
        //        WebS.WebService1 oWebs = new WebS.WebService1();
        //        if(sBool)
        //        {
        //            if(oWebs.set_SavePonderationBillMain_Temp_Select_Qty(model, sQty, ref DBUtility.ClsPub.sErrInfo))
        //            {

        //            }
        //            else
        //            {
        //                objJsonResult.code = "0";
        //                objJsonResult.count = 0;
        //                objJsonResult.Message = "1-单据号：" + sBillNo + "，单据ID：" + sInterID + "；扫描失败！" + DBUtility.ClsPub.sErrInfo;
        //                objJsonResult.data = null;
        //                return objJsonResult;
        //            }
        //        }
        //        else
        //        {
        //            if (oView.HBarCodeType != "托盘条码")
        //            {
        //                if (HSourceBillType == "下架通知单" && HSourceBillNo != "")
        //                {
        //                    if (oWebs.set_SavePonderationBillMain_Temp_FIFO(model, ref DBUtility.ClsPub.sErrInfo))
        //                    {

        //                    }
        //                    else
        //                    {
        //                        objJsonResult.code = "0";
        //                        objJsonResult.count = 0;
        //                        objJsonResult.Message = "1-单据号：" + sBillNo + "，单据ID：" + sInterID + "；扫描失败！" + DBUtility.ClsPub.sErrInfo;
        //                        objJsonResult.data = null;
        //                        return objJsonResult;
        //                    }
        //                }
        //                else
        //                {
        //                    if (oWebs.set_SavePonderationBillMain_Temp_Qty(model, sQty, ref DBUtility.ClsPub.sErrInfo))
        //                    {

        //                    }
        //                    else
        //                    {
        //                        objJsonResult.code = "0";
        //                        objJsonResult.count = 0;
        //                        objJsonResult.Message = "1-单据号：" + sBillNo + "，单据ID：" + sInterID + "；扫描失败！" + DBUtility.ClsPub.sErrInfo;
        //                        objJsonResult.data = null;
        //                        return objJsonResult;
        //                    }
        //                }
        //            }
        //            else
        //            {
        //                if (oWebs.set_SavePonderationBillMain_Temp_Qty(model, sQty, ref DBUtility.ClsPub.sErrInfo))
        //                {

        //                }
        //                else
        //                {
        //                    objJsonResult.code = "0";
        //                    objJsonResult.count = 0;
        //                    objJsonResult.Message = "1-单据号：" + sBillNo + "，单据ID：" + sInterID + "；扫描失败！" + DBUtility.ClsPub.sErrInfo;
        //                    objJsonResult.data = null;
        //                    return objJsonResult;
        //                }
        //            }
        //        }
        //        //return objJsonResult;
        //        objJsonResult.code = "0";
        //        objJsonResult.count = 1;
        //        objJsonResult.Message = "扫码成功！";
        //        objJsonResult.data = null;
        //        return objJsonResult;
        //    }
        //    catch (Exception)
        //    {

        //        throw;
        //    }
        //}


        public Object get_InfoByBarCode_Source_Json(string sCode, Int64 sInterID, string HBillType, string sBillNo, string sMaker, Int64 WhID, Int64 SPID, Int64 HSCWhID,Int64 HSCSPID,Double sQty, bool SourceFlag, string sSourceBillNo, string sHSourceBillType,Int64 HStockInOrgID,Int64 HStockOutOrgID,string HScanStyle)
        {
            try
            {
                DAL.ClsGy_BarCodeBill_View dal = new DAL.ClsGy_BarCodeBill_View();
                SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
                dal.GetInfoByNumber_View(sCode);
                if (dal.omodel_View.HBarCodeType != "托盘条码")
                {
                    return get_InfoByBarCode_Source_Json_s(sCode, sInterID, sBillNo, sQty, HWHID, HSPID, SCWhID, SCSPID, HMaker, HOrgID);
                }
                else
                {
                    //如果是雅琪诺则托盘条码分解并模拟扫码
            //if (sRedBlue == true)
            //{
            //    HBillType = "1245";
            //}
            //oBar = webserver.get_CheckTypeByBarCode(sCode, sInterID, sBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, ref DBUtility.ClsPub.sErrInfo);
            WebS.WebService1 oWebs = new WebS.WebService1();
            WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS();
            string sExpressNumber = "";

                    //分解托条码得到明细条码信息写入出入库条码临时表
                    DataSet dsTBarCode;
                    string sBarCode_MX;
                    dsTBarCode = oCn.RunProcReturn("select b.HBarCode HBarCodeMX from Sc_PackUnionBillMain a  " +
                    " inner join Sc_PackUnionBillSub b on a.HInterID = b.HInterID " +
                    " Where a.HBarCode_Pack = '" + sCode + "'", "Sc_PackUnionBillMain");
                    if (dsTBarCode == null || dsTBarCode.Tables[0].Rows.Count == 0)
                    {
                        //sErrMsg = "没有找到托盘条码！";
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "扫码失败！没有找到托盘条码！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    else
                    {
                        for (int i = 0; i < dsTBarCode.Tables[0].Rows.Count; i++)
                        {
                            sBarCode_MX = DBUtility.ClsPub.isStrNull(dsTBarCode.Tables[0].Rows[i]["HBarCodeMX"]);
                            objJsonResult = (JsonResult)get_InfoByBarCode_Source_Json_s(sBarCode_MX, sInterID, sBillNo, sQty, HWHID, HSPID, SCWhID, SCSPID, HMaker,HOrgID);
                            if (objJsonResult.code == "0")
                            {
                                return objJsonResult;
                            }
                        }
                        return objJsonResult;
                    }
                }

            }
            catch (Exception e)
            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);
            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";
                objJsonResult.count = 0;
                objJsonResult.Message = "扫码失败！" + DBUtility.ClsPub.isStrNull(e);
                objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
                objJsonResult.data = null;
                return objJsonResult;
            }
        }

        public object get_InfoByBarCode_Source_Json_s(string sCode, Int64 sInterID, string sBillNo, Double sQty, Int64 HWHID, Int64 HSPID, Int64 SCWhID, Int64 SCSPID, string HMaker,Int64 HOrgID)
        {
            try
            else
            {
                WebS.ClsKF_PonderationBillMain_Temp model = new WebS.ClsKF_PonderationBillMain_Temp();
                string sErrMsg = "";
                bool sBool = false;
                double sRelQty = 0;
                oView = webserver.get_InfoByBarCode_Source(sCode, sInterID, ref sBool, ref DBUtility.ClsPub.sErrInfo);
                if (oView == null)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "1-单据号：" + sBillNo + "，单据ID：" + sInterID + "；" + DBUtility.ClsPub.sErrInfo;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                if (oView.HBarCodeType == "唯一条码" && sQty > 0 && oView.HQty < sQty)
                {
                    sRelQty = oView.HQty;
                }
                else if (sQty > 0)
                {
                    sRelQty = sQty;
                }
                else
                {
                    sRelQty = oView.HQty;
                }

                model.HInterID = DBUtility.ClsPub.isLong(sInterID);
                model.HBillNo = DBUtility.ClsPub.isStrNull(sBillNo);
                model.HBillType = this.HBillType;
                model.HMaker = HMaker;
                //
                model.HMaterID = oView.HMaterID;
                model.HAuxPropID = oView.HAuxPropID;
                model.HErpClsID = oView.HErpClsID;
                model.HQty = oView.HQty;
                model.HQtyMust = oView.HinitQty;
                model.HBarCode = oView.HBarCode;
                model.HBatchNo = oView.HBatchNo;
                model.HMTONo = oView.HMTONo;

                model.HWhID = DBUtility.ClsPub.isLong(HWHID);
                model.HStockPlaceID = DBUtility.ClsPub.isLong(HSPID);
                model.HSCWHID = SCWhID;
                model.HOutStockPlaceID = SCSPID;
                //model.HVDAPack = txtHVDAPack2.Text.Trim();
                //model.HVDAMaterNum = txtHVDAMaterID.Text.Trim();
                //model.HVDAQty = DBUtility.ClsPub.ObjToDouble(txtHVDAQty.Text.Trim());
                //
                model.HSourceInterID = oView.HSourceInterID;
                model.HSourceEntryID = oView.HSourceEntryID;
                model.HSourceBillNo = oView.HSourceBillNo;
                model.HSourceBillType = oView.HSourceBillType;
                model.HRedBlueFlag = false;
                model.HPieceQty = 1;
                model.HSTOCKORGID = HOrgID;
                model.HOWNERID = HOrgID;

                WebS.WebService1 oWebs = new WebS.WebService1();
                //if (webserver.set_SavePonderationBillMain_Temp_Qty(model, sQty, ref DBUtility.ClsPub.sErrInfo))
                bool flag = oWebs.Get_CheckQtyByBarCode_GetWhAndSP(model.HInterID, model.HBillType, model.HBarCode, ref SCWhID, ref SCSPID, sRelQty, ref sRelQty);
                if (flag)
                {
                    //sQty = sRelQty;
                    model.HSCWHID = SCWhID;
                    model.HOutStockPlaceID = SCSPID;
                    if(SCWhID<=0)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "1-仓库无库存！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                }
                else if (sRelQty == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "2-无库存！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (oWebs.set_SavePonderationBillMain_Temp_Qty(model, sQty, ref DBUtility.ClsPub.sErrInfo))
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "3-扫码成功！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "4-扫码失败！" + DBUtility.ClsPub.sErrInfo;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
            }
            catch (Exception)
            {

                throw;
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
                objJsonResult.data = WebSoBar;
                return objJsonResult;
            }
        }

@@ -398,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);
@@ -433,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;

                if (webserver.set_SaveMoveStockBill(websLsmain, "-1", ref DBUtility.ClsPub.sErrInfo))
                //    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 = "生成调拨单成功！单据号为：";
                    objJsonResult.Message = DBUtility.ClsPub.sErrInfo;  //成功！
                    objJsonResult.data = null;
                    return objJsonResult;
                }
@@ -452,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;
                }
@@ -467,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;
        //    }
        //}



@@ -526,7 +858,8 @@
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "生成调拨单成功！单据号为：";
                    objJsonResult.Message = DBUtility.ClsPub.sErrInfo;  //成功！
                    //objJsonResult.Message = "生成调拨单成功！单据号为：";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
@@ -534,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;
                }
@@ -604,8 +938,18 @@
            {
                // DataSet ds = new DataSet();
                // WebServer webserver = new WebServer();
                WebS.WebService1 oWebs = new WebS.WebService1();

                string sWhere = " Where 单据号 like '%" + HSourceBillNo.Trim() + "%'";
                ds = webserver.GetSc_PPBomBillList(sWhere);
                if (HSourceBillType == "3720")
                {
                    ds = webserver.GetSc_PPBomBillList(sWhere);
                }
                else if (HSourceBillType == "1243")
                {
                    //ds = webserver.GetKf_MoveStockRequestBillList(sWhere);
                    ds = oWebs.GetKf_MoveStockRequestBillList(sWhere);
                }
                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {

@@ -627,7 +971,7 @@
                        objJsonResult.code = "0";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "返回记录成功！";
                        objJsonResult.data = null;
                        objJsonResult.data = ds.Tables[0];
                        return objJsonResult;
                    }
                    else