新增了 PDA 扫码生成 生产汇报单 分布式调出单

ch

2021-11-21 552c3e5bf3bf0f78e3b3d971e0cae407bafbcaa2

新增了  PDA 扫码生成 生产汇报单  分布式调出单

 Model/Model.csproj

@@ -214,8 +214,10 @@
    <Compile Include="仓库管理\ClsKf_MateOutRequestBillSub.cs" />
    <Compile Include="仓库管理\ClsKF_ChangeBoxBillMain.cs" />
    <Compile Include="仓库管理\ClsKF_ChangeBoxBillSub.cs" />
    <Compile Include="仓库管理\ClsKf_MoveStockStepOutBillMain.cs" />
    <Compile Include="仓库管理\ClsKf_MoveStockBillMain.cs" />
    <Compile Include="仓库管理\ClsKf_MoveStockBillScheme.cs" />
    <Compile Include="仓库管理\ClsKf_MoveStockStepOutBillSub.cs" />
    <Compile Include="仓库管理\ClsKf_MoveStockBillSub.cs" />
    <Compile Include="仓库管理\ClsKf_OtherInBillMain.cs" />
    <Compile Include="仓库管理\ClsKf_OtherInBillScheme.cs" />

 Model/²Ö¿â¹ÜÀí/ClsKf_MoveStockStepOutBillMain.cs

New file
@@ -0,0 +1,23 @@
using System;
using System.Collections.Generic;
using System.Text;

namespace Model
{
    public class ClsKf_MoveStockStepOutBillMain : DBUtility.ClsXt_BaseBillMain
    {
        public Int64 HSupID;//   int                --供应商
        public Int64 HWHID;//    int                 --仓库
        public Int64 HSCWHID;//  int                   --调出仓库   
        public Int64 HEmpID;//    int                --业务员
        public Int64 HManagerID;//   int            --负责人
        public Int64 HSecManagerID;//  int           --验收
        public Int64 HKeeperID;//   int             --保管员
        public Int64 HDeptID;//     int             --部门
        public string HExplanation;//   varchar(200)        --ÕªÒª
        public string HInnerBillNo;//  varchar(50)         --内部单据号
        public bool HRedBlueFlag;//  bit            --红蓝单
        public int HCurID;

    }
}

 Model/²Ö¿â¹ÜÀí/ClsKf_MoveStockStepOutBillSub.cs

New file
@@ -0,0 +1,37 @@
using System;
using System.Collections.Generic;
using System.Text;

namespace Model
{
    public class ClsKf_MoveStockStepOutBillSub : DBUtility.ClsXt_BaseBillSub
    { 
        public Int64 HMaterID;//     int               --物料ID
        public string HBatchNo;//    varchar(50)         --批次
        public int HAuxPropID;
        public Int64 HPropertyID;//  int                --辅助属性
        public Int64 HSecUnitID;//   int                --辅助计量单位
        public Single HSecUnitRate;//       money            --换算率 	
        public Int64 HUnitID;//    int                  --计量单位
        public double HQtyMust;//   dec(18,8)               --应收数量
        public double HQty;//        dec(18,8)              --实收数量
        public double HPrice;//     dec(18,8)               --单价
        public double HMoney;//     dec(18,8)              --金额
        public Int64 HWHID;//      int                  --收料仓库
        public Int64 HSCWHID;//    int                     --调出仓库ID 
        public Int64 HSPID;//      int                  --调入仓位
        public Int64 HSCSPID;//    int                     --调出仓位ID 
        public Int64 HPOOrderInterID;//  int              --采购订单主内码
        public Int64 HPOOrderEntryID;//    int            --采购订单子内码
        public string HPOOrderBillNo;//    varchar(50)         --采购订单号
        public Int64 HSeOrderInterID;//   int             --销售订单主内码
        public Int64 HSeOrderEntryID;//      int            --销售订单子内码
        public string HSeOrderBillNo;//    varchar(50)        --销售订单号
        public double HOrderPrice;
        public double HInvoiceQty;
        public string HContainerNum;
        public double HGrossQty;
        public double HNetQty;

    }
}

 WebAPI/Controllers/MoveStockBillController.cs

@@ -467,6 +467,90 @@
                return objJsonResult;
            }
        }



        /// <summary>
        /// ç”Ÿæˆåˆ†å¸ƒå¼è°ƒå‡ºå•
        /// </summary>
        /// <returns></returns>
        [Route("MoveStockStepOutBill/set_SaveMoveStockStepOutBill_Json")]
        [HttpPost]
        public object set_SaveMoveStockStepOutBill_Json([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_MoveStockStepOutBillMain> lsmain = new List<Model.ClsKf_MoveStockStepOutBillMain>();
                ListModels oListModels = new ListModels();
                lsmain = oListModels.getMoveStockStepOutBillMainByJson(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_MoveStockStepOutBillMain websLsmain = new WebS.ClsKf_MoveStockStepOutBillMain();
                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 = "1250";
                websLsmain.HSupID = 0;
                //websLsmain.HGroupID = lsmain[0].HGroupID;

                if (webserver.set_SaveMoveStockBill(websLsmain, "-1", ref DBUtility.ClsPub.sErrInfo))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "生成调拨单成功！单据号为：";
                    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;
            }
        }


        /// <summary>
        /// 
        /// </summary>
@@ -567,6 +651,106 @@
            }
        }


        /// <summary>
        /// å†™å…¥ä¸´æ—¶è¡¨  æ‰«æºå•çš„方法
        /// </summary>
        /// <param name="HSourceBillNo"></param>
        /// <returns></returns>
        [Route("MoveStockStepOutBill/set_sourcebill")]
        [HttpGet]
        public object set_sourcebill(string HSourceBillType, string HSourceBillNo, Int64 sInterID, string sBillNo)
        {
            try
            {
                // DataSet ds = new DataSet();
                // WebServer webserver = new WebServer();
                string sWhere = " Where å•æ®å· like '%" + HSourceBillNo.Trim() + "%'";
                ds = webserver.GetXs_SeOutStockBillList(sWhere);
                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {

                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有返回任何记录！";
                    objJsonResult.data = null;
                    return objJsonResult;
                    //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning);
                }
                else
                {
                    //HSupID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HSupID"]);
                    //HSupName = Convert.ToString(ds.Tables[0].Rows[0]["HSupName"]);
                    HDeptID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HDeptID"]);
                    HDeptName = Convert.ToString(ds.Tables[0].Rows[0]["HDeptName"]);
                    if (webserver.set_SavePonderationBillMain_Temp_Source_Fast(sInterID, sBillNo, HBillType, HSourceBillNo, HSourceBillType, "蓝字", ref DBUtility.ClsPub.sErrInfo))
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "返回记录成功！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    else
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "写入临时表失败！" + DBUtility.ClsPub.sErrInfo;
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                }
            }
            catch (Exception ex)
            {

                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录！" + ex.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }



        /// <summary>
        /// åˆ†å¸ƒå¼è°ƒå‡ºå•æ‰«ç /扫条码/直接调用webservice
        /// </summary>
        /// <returns></returns>
        [Route("MoveStockStepOutBill/get_CheckTypeByBarCode_Json")]
        [HttpGet]
        public Object get_CheckTypeByBarCode_Json(string sCode, Int64 sInterID, string sBillNo, string sBillType, string sMaker, Int64 WhID, Int64 SPID, Double sQty, bool sRedBlue, bool SourceFlag, string sSourceBillNo, string sSourceType, Int64 HOWNERID)
        {
            //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 = "";
            //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_CheckTypeByBarCode_All(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo);
            if (WebSoBar == null)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
                objJsonResult.data = null;
                return objJsonResult;
            }
            else
            {
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
                objJsonResult.data = WebSoBar;
                return objJsonResult;
            }
        }


        //删除记录
        [Route("MoveStock/Delete_Json")]
        [HttpGet]

 WebAPI/Controllers/POStockInBillController.cs

@@ -268,6 +268,80 @@
                return objJsonResult;
            }
        }



        /// <summary>
        /// å†™å…¥ä¸´æ—¶è¡¨  æ‰«æºå•çš„方法
        /// </summary>
        /// <param name="HSourceBillNo"></param>
        /// <returns></returns>
        [Route("ICMOReportBill/set_SaveICMOReportBill")]
        [HttpGet]
        public object set_SaveICMOReportBill(string HSourceBillType, string HSourceBillNo, Int64 sInterID, string sBillNo)
        {
            try
            {
                // DataSet ds = new DataSet();
                // WebServer webserver = new WebServer();
                string sWhere = " Where å•æ®å· like '%" + HSourceBillNo.Trim() + "'";
                //根据源单类型来调用不同的WEBS方法 new 
                if (HSourceBillType == "3710")
                {
                    ds = webserver.GetSc_ICMOBillList(sWhere + "  ");
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有返回任何记录,源单类型有错误！";
                    objJsonResult.data = null;
                    return objJsonResult; ;
                }
                //
                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有返回任何记录！" + HSourceBillType;
                    objJsonResult.data = null;
                    return objJsonResult;
                    //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning);
                }
                else
                {
                    HDeptID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HDeptID"]);
                    HDeptName = Convert.ToString(ds.Tables[0].Rows[0]["HDeptName"]);
                    if (webserver.set_SavePonderationBillMain_Temp_Source_Fast(sInterID, sBillNo, HBillType, HSourceBillNo, HSourceBillType, "蓝字", ref DBUtility.ClsPub.sErrInfo))
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "返回记录成功！";
                        objJsonResult.data = ds.Tables[0];
                        return objJsonResult;
                    }
                    else
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "写入临时表失败！" + DBUtility.ClsPub.sErrInfo;
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                }
            }
            catch (Exception ex)
            {

                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录！" + ex.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }


        /// <summary>
        /// è¿”回出入库条码临时表     
        /// </summary>
@@ -606,6 +680,66 @@
            }
        }


        /// <summary>
        /// ç”Ÿäº§æ±‡æŠ¥å•/提交/直接调webservice
        /// </summary>
        /// <returns></returns>
        [Route("ICMOReportBill/set_SaveICMOReportBill_Json")]
        [HttpPost]
        public object set_SaveICMOReportBill_Json([FromBody] JObject oMain)
        {
            var _value = oMain["oMain"].ToString();
            string msg1 = _value.ToString();
            try
            {
                List<Model.ClsSc_ICMOReportBillMain> lsmain = new List<Model.ClsSc_ICMOReportBillMain>();
                ListModels oListModels = new ListModels();
                lsmain = oListModels.getICMOReportBillMainByJson(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;
                
                WebAPI.WebS.ClsSc_ICMOReportBillMain websLsmain = new WebS.ClsSc_ICMOReportBillMain();

                websLsmain.HInterID = lsmain[0].HInterID;
                websLsmain.HBillNo = lsmain[0].HBillNo;
                websLsmain.HBillType = "1201";//固定值
                websLsmain.HDate = lsmain[0].HDate;
                websLsmain.HDeptID = lsmain[0].HDeptID;
                websLsmain.HEmpID = 0;
                websLsmain.HBillerID = lsmain[0].HBillerID;
                websLsmain.HRemark = "";
                websLsmain.HMainSourceBillType = lsmain[0].HBillType;


                if (webserver.set_SaveICMOReportBill_Json(websLsmain, sSourceBillType, ref DBUtility.ClsPub.sErrInfo))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "成功！单据号为：";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "上传失败！" + DBUtility.ClsPub.sErrInfo;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "上传失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }

        [Route("POStockInBill/GetSpName_Json")]
        [HttpGet]
        public object GetSpName_Json(long HSpID, long HWHID, long HStockOrgID, ref string sErrMsg)

 WebAPI/ListModels.cs

@@ -28,6 +28,18 @@
            List<Model.ClsKf_POStockInBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsKf_POStockInBillMain>>(jsonString);
            return list;
        }

        /// <summary>
        /// ç”Ÿäº§æ±‡æŠ¥å•ååºåˆ—化
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsSc_ICMOReportBillMain> getICMOReportBillMainByJson(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsSc_ICMOReportBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ICMOReportBillMain>>(jsonString);
            return list;
        }
        /// <summary>
        /// å¤–购入库(红字)反序列化
        /// </summary>
@@ -62,6 +74,18 @@
            List<Model.ClsKf_MoveStockBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsKf_MoveStockBillMain>>(jsonString);
            return list;
        }

        /// <summary>
        /// åˆ†å¸ƒå¼è°ƒå‡ºå•ååºåˆ—化
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsKf_MoveStockStepOutBillMain> getMoveStockStepOutBillMainByJson(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsKf_MoveStockStepOutBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsKf_MoveStockStepOutBillMain>>(jsonString);
            return list;
        }
        /// <summary>
        /// äº§å“å…¥åº“反序列化
        /// </summary>

 WebAPI/WebServer.cs

@@ -3991,6 +3991,25 @@
            //sErrMsg = "保存调拨单失败！" + sErrMsg;
            //return false;
        }

        public bool set_MoveStockStepOutBill(WebAPI.WebS.ClsKf_MoveStockStepOutBillMain oMain, string sHSourceType, ref string sErrMsg)
        {
            WebS.WebService1 oWebs = new WebS.WebService1();
            if (oWebs.set_SaveMoveStockStepOutBill_New(oMain, sHSourceType, ref sErrMsg))
            {
                sErrMsg = "保存成功！" + oMain.HBillNo;
                return true;
            }
            else
            {
                sErrMsg = "单据号：" + oMain.HBillNo + ", å•æ®ID：" + oMain.HInterID + ";" + sErrMsg;
                return false;
            }

            
        }


        //删除记录
        public bool set_DelPonderationBillMain_Temp_InterIDAndSource(long HInterID, long HMaterID, long HAuxPropID, string HMTONo, long HSourceInterID, long HSourceEntryID, string sHBillType, ref string sErrMsg)
        {
@@ -4487,6 +4506,33 @@
            }
        }

        public bool set_SaveICMOReportBill_Json(WebAPI.WebS.ClsSc_ICMOReportBillMain oMain, string sHSourceType, ref string sErrMsg)
        {
            //BLL.ClsKf_POStockInBill bll = new BLL.ClsKf_POStockInBill();
            //return bll.set_SavePOStockInBill_New(oMain, sHSourceType, ref DBUtility.ClsPub.sExeReturnInfo);
            WebS.WebService1 oWebs = new WebS.WebService1();
            if (oWebs.set_SaveICMOReportBill_New(oMain, sHSourceType, ref sErrMsg))
            {
                //判断是否反写成功
                //if (set_UpdateHStatus(oMain.HInterID, oMain.HExplanation.ToString()))
                //{
                    sErrMsg = "保存成功！" + oMain.HBillNo;
                    return true;
                //}
                //else
                //{
                //    sErrMsg = "保存成功！" + oMain.HBillNo + "状态反写失败！";
                //    return true;
                //}
            }
            else
            {
                sErrMsg = "单据号：" + oMain.HBillNo + ", å•æ®ID：" + oMain.HInterID + ";" + sErrMsg;
                return false;
            }
        }


        /// <summary>
        /// ç”Ÿæˆå¤–购入库单K3
        /// </summary>