yxj
2022-11-09 6ca558d705f7f8cbc1d58e334202476ad3359543
先进先出控制优化
1个文件已修改
67 ■■■■■ 已修改文件
CLOUDWEB/WebService1.asmx.cs 67 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CLOUDWEB/WebService1.asmx.cs
@@ -24108,7 +24108,7 @@
                        if (HReturn.Contains("\"IsSuccess\":false") == true)
                        {
                            sErrMsg = "生成采购入库单失败!" + HReturn + sJson;
                            sErrMsg = "生成采购入库单失败!" + HReturn;
                            LogService.Write("生成采购入库单(源单:收料通知单)失败!" + HReturn + sJson);   //写入txt文本
                            oCn.RollBack();
                            return false;
@@ -33527,7 +33527,8 @@
                }
                else if (oSystemParameter.omodel.WMS_CampanyName == "四维尔")
                {
                    SqlConnection ocn = new SqlConnection(@"Data Source=192.168.0.200;DataBase=master;User ID=HX_USER;PWD=lc@841022;max pool size=32767");//四维尔
                    SqlConnection ocn = new SqlConnection(@"Data Source=192.168.0.193\SWE2014;DataBase=master;User ID=HX_USER;PWD=lc@841022;max pool size=32767");//四维尔
                    //SqlConnection ocn = new SqlConnection(@"Data Source=192.168.0.200;DataBase=master;User ID=HX_USER;PWD=lc@841022;max pool size=32767");//四维尔
                    ocn.Open();
                    SqlCommand cm = new SqlCommand(sSQL, ocn);
                    cm.CommandTimeout = 600;
@@ -37069,20 +37070,21 @@
                DataSet FIFO = oCn.RunProcReturn("exec h_p_Kf_ICInventory_FIFO_Tmp_BarCode " + HBillID.ToString() + ",'" + HBillType + "','" + model.HBatchNo + "','" + model.HBarCode + "'," + model.HQty.ToString(), "h_p_Kf_ICInventory_FIFO_Tmp_BarCode");
                if (FIFO == null || FIFO.Tables[0].Rows.Count == 0)
                {
                    sErrMsg = "请根据先进先出清单扫码!";
                    sErrMsg = "判断先进先出控制发生错误!";
                    return false;
                }
                //else
                //{
                //    model.HWhID = DBUtility.ClsPub.isLong(FIFO.Tables[0].Rows[0]["HWHID"]);
                //    model.HStockPlaceID = DBUtility.ClsPub.isLong(FIFO.Tables[0].Rows[0]["HSPID"]);
                //    model.HQty = DBUtility.ClsPub.isDoule(FIFO.Tables[0].Rows[0]["HQty"]);
                //    model.HQtyMust = DBUtility.ClsPub.isDoule(FIFO.Tables[0].Rows[0]["HSumQtyMust"]);
                //    model.HSourceInterID = DBUtility.ClsPub.isLong(FIFO.Tables[0].Rows[0]["HSourceInterID"]);
                //    model.HSourceEntryID = DBUtility.ClsPub.isLong(FIFO.Tables[0].Rows[0]["HSourceEntryID"]);
                //    model.HSourceBillNo = DBUtility.ClsPub.isStrNull(FIFO.Tables[0].Rows[0]["HSourceBillNo"]);
                //    model.HSourceBillType = DBUtility.ClsPub.isStrNull(FIFO.Tables[0].Rows[0]["HSourceBillType"]);
                //}
                else
                {
                    if (DBUtility.ClsPub.isLong(FIFO.Tables[0].Rows[0][0]) == 0)
                    {
                        sRelQty = DBUtility.ClsPub.isDoule(FIFO.Tables[0].Rows[0]["HQty"]);
                    }
                    else
                    {
                        sErrMsg = DBUtility.ClsPub.isStrNull(FIFO.Tables[0].Rows[0]["HRemark"]);
                        return false;
                    }
                }
            }
            //物料条码写入临时表时,判断仓库仓位是否正确
@@ -42938,12 +42940,20 @@
                    DataSet dsFIFO = oCn.RunProcReturn("exec h_p_Kf_ICInventory_FIFO_Tmp_BarCode " + HInterID.ToString() + ",'" + HBillType + "','" + omodel_View.HBatchNo + "','" + omodel_View.HBarCode + "'," + sRelQty.ToString(), "h_p_Kf_ICInventory_FIFO_Tmp_BarCode");
                    if (dsFIFO == null || dsFIFO.Tables[0].Rows.Count == 0)
                    {
                        sErrMsg = "启用先进先出控制,所扫条码不在先进先出列表清单中!";
                        sErrMsg = "判断先进先出控制发生错误!";
                        return null;
                    }
                    else
                    {
                        sRelQty = DBUtility.ClsPub.isDoule(dsFIFO.Tables[0].Rows[0]["HQty"]);
                        if (DBUtility.ClsPub.isLong(dsFIFO.Tables[0].Rows[0][0]) == 0)
                        {
                            sRelQty = DBUtility.ClsPub.isDoule(dsFIFO.Tables[0].Rows[0]["HQty"]);
                        }
                        else
                        {
                            sErrMsg = DBUtility.ClsPub.isStrNull(dsFIFO.Tables[0].Rows[0]["HRemark"]);
                            return null;
                        }
                    }
                }
            }
@@ -43711,20 +43721,21 @@
                DataSet FIFO = oCn.RunProcReturn("exec h_p_Kf_ICInventory_FIFO_Tmp_BarCode " + HBillID.ToString() + ",'" + HBillType + "','" + oMain.HBatchNo + "','" + oMain.HBarCode + "'," + oMain.HQty.ToString(), "h_p_Kf_ICInventory_FIFO_Tmp_BarCode");
                if (FIFO == null || FIFO.Tables[0].Rows.Count == 0)
                {
                    sErrMsg = "请根据先进先出清单扫码!";
                    sErrMsg = "判断先进先出控制发生错误!";
                    return false;
                }
                //else
                //{
                //    oMain.HWhID = DBUtility.ClsPub.isLong(FIFO.Tables[0].Rows[0]["HWHID"]);
                //    oMain.HStockPlaceID = DBUtility.ClsPub.isLong(FIFO.Tables[0].Rows[0]["HSPID"]);
                //    oMain.HQty = DBUtility.ClsPub.isDoule(FIFO.Tables[0].Rows[0]["HQty"]);
                //    oMain.HQtyMust = DBUtility.ClsPub.isDoule(FIFO.Tables[0].Rows[0]["HSumQtyMust"]);
                //    oMain.HSourceInterID = DBUtility.ClsPub.isLong(FIFO.Tables[0].Rows[0]["HSourceInterID"]);
                //    oMain.HSourceEntryID = DBUtility.ClsPub.isLong(FIFO.Tables[0].Rows[0]["HSourceEntryID"]);
                //    oMain.HSourceBillNo = DBUtility.ClsPub.isStrNull(FIFO.Tables[0].Rows[0]["HSourceBillNo"]);
                //    oMain.HSourceBillType = DBUtility.ClsPub.isStrNull(FIFO.Tables[0].Rows[0]["HSourceBillType"]);
                //}
                else
                {
                    if (DBUtility.ClsPub.isLong(FIFO.Tables[0].Rows[0][0]) == 0)
                    {
                        sRelQty = DBUtility.ClsPub.isDoule(FIFO.Tables[0].Rows[0]["HQty"]);
                    }
                    else
                    {
                        sErrMsg = DBUtility.ClsPub.isStrNull(FIFO.Tables[0].Rows[0]["HRemark"]);
                        return false;
                    }
                }
            }
            oCn.RunProc("Insert into KF_PonderationBillMain_Temp " +