直接调拨、其他入库、其他出库无源单扫码上传生成单据，单据类型递入值取界面上所选单据类型；扫描物料条码时递入数量判断优化修改

yxj

2023-01-11 54cc0b5dcce2c0e0dea85ec831f467d6302eecad

直接调拨、其他入库、其他出库无源单扫码上传生成单据，单据类型递入值取界面上所选单据类型；扫描物料条码时递入数量判断优化修改

 CLOUDWEB/WebService1.asmx.cs

@@ -8523,7 +8523,17 @@
                {
                    string sJson_StockStyle = "";
                    string sJson_MainCustom = "";    //主表自定义字段
                    string sJson_BillTypeID = "";    //单据类型
                    sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);

                    if (oMain.HBillSubType == "" || oMain.HBillSubType == null)
                    {
                        sJson_BillTypeID = "\"FBillTypeID\":{ \"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FBillTypeID"]) + "\" },";
                    }
                    else
                    {
                        sJson_BillTypeID = "\"FBillTypeID\":{ \"FNumber\":\"" + oMain.HBillSubType + "\" },";
                    }

                    if (oSystemParameterMain.WMS_CampanyName == "韩电") //系统参数  客户定制化名称     空白为通用
                    {
@@ -8537,7 +8547,7 @@
                    string sJson_Main = "{\"Creator\":\"\",\"NeedUpDateFields\":[]," +
                        "\"Model\":{ " +
                        "\"FBillNo\":\"" + oMain.HBillNo + "\"," +
                        "\"FBillTypeID\":{ \"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FBillTypeID"]) + "\" }," +
                        sJson_BillTypeID +
                        "\"FBizType\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FBizType"]) + "\"," +
                        "\"FTransferDirect\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FTransferDirect"]) + "\"," +
                        "\"FTransferBizType\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FTransferBizType"]) + "\"," +
@@ -21956,7 +21966,17 @@
                {
                    string sJson_StockStyle = "";
                    string sJson_MainCustom = "";   //主表自定义字段
                    string sJson_BillTypeID = "";    //单据类型
                    sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);

                    if (oMain.HBillSubType == "" || oMain.HBillSubType == null)
                    {
                        sJson_BillTypeID = "\"FBillTypeID\":{ \"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FBillTypeID"]) + "\" },";
                    }
                    else
                    {
                        sJson_BillTypeID = "\"FBillTypeID\":{ \"FNumber\":\"" + oMain.HBillSubType + "\" },";
                    }

                    if (oSystemParameterMain.WMS_CampanyName == "韩电") //系统参数  客户定制化名称     空白为通用
                    {
@@ -21972,7 +21992,7 @@
                    }
                    string sJson_Main = "{\"Creator\":\"\",\"NeedUpDateFields\":[],\"NeedReturnFields\":[],\"IsDeleteEntry\":\"True\",\"SubSystemId\":\"\",\"IsVerifyBaseDataField\":\"false\",\"IsEntryBatchFill\":\"True\",\"Model\":{ \"FBillNo\":\"" + oMain.HBillNo + "\"," +
                        //\"FID\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FID"]) + "\"," +
                        "\"FBillTypeID\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FBillTypeID"]) + "\"}," +
                        sJson_BillTypeID +
                        "\"FStockOrgId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FStockOrgId"]) + "\"}," +
                        "\"FPickOrgId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FPickOrgId"]) + "\"}," +
                        "\"FStockDirect\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FStockDirect"]) + "\"," +
@@ -31358,7 +31378,17 @@
                {
                    string sJson_StockStyle = "";
                    string sJson_MainCustom = "";   //主表自定义字段
                    string sJson_BillTypeID = "";    //单据类型
                    sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);

                    if (oMain.HBillSubType == "" || oMain.HBillSubType == null)
                    {
                        sJson_BillTypeID = "\"FBillTypeID\":{ \"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FBillTypeID"]) + "\" },";
                    }
                    else
                    {
                        sJson_BillTypeID = "\"FBillTypeID\":{ \"FNumber\":\"" + oMain.HBillSubType + "\" },";
                    }

                    if (oSystemParameterMain.WMS_CampanyName == "韩电") //系统参数  客户定制化名称     空白为通用
                    {
@@ -31376,7 +31406,7 @@
                    string sJson_Main = "{\"Creator\":\"\",\"NeedUpDateFields\":[],\"NeedReturnFields\":[],\"IsDeleteEntry\":\"True\",\"SubSystemId\":\"\",\"IsVerifyBaseDataField\":\"false\",\"IsEntryBatchFill\":\"True\",\"Model\":{\"FBillNo\":\"" + oMain.HBillNo + "\"," +

                        //\"FID\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FID"]) + "\"," +
                        "\"FBillTypeID\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FBillTypeID"]) + "\"}," +
                        sJson_BillTypeID +
                        "\"FStockOrgId\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FStockOrgId"]) + "\"}," +
                        "\"FStockDirect\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FStockDirect"]) + "\"," +
                        "\"FDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FDate"]) + "\"," +
@@ -36074,7 +36104,10 @@
            {
                NewBarCode = sBarCode.Split(Convert.ToChar("#"));
                sBarCode = NewBarCode[0];
                HQty = DBUtility.ClsPub.isDoule(NewBarCode[1]);
                if (HQty == 0)
                {
                    HQty = DBUtility.ClsPub.isDoule(NewBarCode[1]);
                }
            }
            //根据物料条码得到对应源单信息，非多源单模式，判断是否已有源单记录(单据类型=1203，其他入库单除外)
            if (SourceFlag || HBillType == "1203")
@@ -36632,7 +36665,10 @@
            {
                NewBarCode = sBarCode.Split(Convert.ToChar("#"));
                sBarCode = NewBarCode[0];
                HQty = DBUtility.ClsPub.isDoule(NewBarCode[1]);
                if (HQty == 0)
                {
                    HQty = DBUtility.ClsPub.isDoule(NewBarCode[1]);
                }
            }
            //根据条码获取条码信息，存在相同物料时自动获取一行源单信息
            DAL.ClsGy_BarCodeBill_View dal = new DAL.ClsGy_BarCodeBill_View();
@@ -37141,7 +37177,10 @@
            {
                NewBarCode = sBarCode.Split(Convert.ToChar("#"));
                sBarCode = NewBarCode[0];
                HQty = DBUtility.ClsPub.isDoule(NewBarCode[1]);
                if (HQty == 0)
                {
                    HQty = DBUtility.ClsPub.isDoule(NewBarCode[1]);
                }
            }
            //根据条码获取条码信息
            DAL.ClsGy_BarCodeBill_View dal = new DAL.ClsGy_BarCodeBill_View();
@@ -37878,7 +37917,10 @@
            {
                NewBarCode = sBarCode.Split(Convert.ToChar("#"));
                sBarCode = NewBarCode[0];
                HQty = DBUtility.ClsPub.isDoule(NewBarCode[1]);
                if (HQty == 0)
                {
                    HQty = DBUtility.ClsPub.isDoule(NewBarCode[1]);
                }
            }

            //根据条码获取条码信息
@@ -38185,7 +38227,10 @@
            {
                NewBarCode = sBarCode.Split(Convert.ToChar("#"));
                sBarCode = NewBarCode[0];
                HQty = DBUtility.ClsPub.isDoule(NewBarCode[1]);
                if (HQty == 0)
                {
                    HQty = DBUtility.ClsPub.isDoule(NewBarCode[1]);
                }
            }

            //获取系统参数
@@ -40555,7 +40600,10 @@
            {
                NewBarCode = sBarCode.Split(Convert.ToChar("#"));
                sBarCode = NewBarCode[0];
                HQty = DBUtility.ClsPub.isDoule(NewBarCode[1]);
                if (HQty == 0)
                {
                    HQty = DBUtility.ClsPub.isDoule(NewBarCode[1]);
                }
            }

            //获取系统参数
@@ -41671,6 +41719,36 @@






        #region 界面控件功能调用方法

        //根据单据类型获取单据子类型
        [WebMethod]
        public DataSet get_BillSubType(string HBillType, Int64 HStockOrgID)
        {
            try
            {
                DataSet ds;
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                ds = oCN.RunProcReturn("exec h_p_WMS_GetBillSubType '" + HBillType + "'," + HStockOrgID.ToString(), "h_p_WMS_GetBillSubType");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    return null;
                }
                else
                {
                    return ds;
                }
            }
            catch (Exception e)
            {
                return null;
            }
        }

        #endregion


        #region 源单处理方法
@@ -42940,7 +43018,7 @@
                }
            }
            else if (oSystemParameter.omodel.WMS_CampanyName == "卓力" || oSystemParameter.omodel.WMS_CampanyName == "开山重工"
                    || oSystemParameter.omodel.WMS_CampanyName == "杭州智见" || oSystemParameter.omodel.WMS_CampanyName == "杭州斯莫尔"
                    || oSystemParameter.omodel.WMS_CampanyName == "杭州智见"
                    || oSystemParameter.omodel.WMS_CampanyName == "四维尔" || oSystemParameter.omodel.WMS_CampanyName == "圣龙"
                    || oSystemParameter.omodel.WMS_CampanyName == "雅琪诺" || oSystemParameter.omodel.WMS_CampanyName == "凯贝奈特"
                    || oSystemParameter.omodel.WMS_CampanyName == "奥邦" || oSystemParameter.omodel.WMS_CampanyName == "博日科技"
@@ -44063,7 +44141,10 @@
                    {
                        NewBarCode = sBarCode.Split(Convert.ToChar("#"));
                        sBarCode = NewBarCode[0];
                        HQty = DBUtility.ClsPub.isDoule(NewBarCode[1]);
                        if(HQty==0)
                        {
                            HQty = DBUtility.ClsPub.isDoule(NewBarCode[1]);
                        }
                    }
                }
                //截取条码前三位字符串
@@ -45003,7 +45084,10 @@
                    {
                        NewBarCode = sBarCode.Split(Convert.ToChar("#"));
                        sBarCode = NewBarCode[0];
                        HQty = DBUtility.ClsPub.isDoule(NewBarCode[1]);
                        if (HQty == 0)
                        {
                            HQty = DBUtility.ClsPub.isDoule(NewBarCode[1]);
                        }
                    }
                }

@@ -46734,7 +46818,10 @@
                    {
                        NewBarCode = sBarCode.Split(Convert.ToChar("#"));
                        sBarCode = NewBarCode[0];
                        HQty = DBUtility.ClsPub.isDoule(NewBarCode[1]);
                        if (HQty == 0)
                        {
                            HQty = DBUtility.ClsPub.isDoule(NewBarCode[1]);
                        }
                    }
                }

@@ -47647,7 +47734,10 @@
                    {
                        NewBarCode = sBarCode.Split(Convert.ToChar("#"));
                        sBarCode = NewBarCode[0];
                        HQty = DBUtility.ClsPub.isDoule(NewBarCode[1]);
                        if (HQty == 0)
                        {
                            HQty = DBUtility.ClsPub.isDoule(NewBarCode[1]);
                        }
                    }
                }

@@ -48453,7 +48543,10 @@
            {
                NewBarCode = sBarCode.Split(Convert.ToChar("#"));
                sBarCode = NewBarCode[0];
                HQty = DBUtility.ClsPub.isDoule(NewBarCode[1]);
                if (HQty == 0)
                {
                    HQty = DBUtility.ClsPub.isDoule(NewBarCode[1]);
                }
            }

            //获取系统参数