夏宝专用调拨模块扫描源单、物料条码调用方法修改

yxj

2025-07-21 7070dd9d3aa789cb5612a0b194c4c7a00f74a83d

夏宝专用调拨模块扫描源单、物料条码调用方法修改

 CLOUDWEB/WebService1.asmx.cs

@@ -54329,42 +54329,6 @@
            {
                if (DBUtility.ClsPub.isLong(ds1.Tables[0].Rows[0][0]) == 0)
                {
                    //先进先出控制
                    if (oSystemParameter.omodel.Kf_MoveStockBill_FIFOCtl == "Y")  //系统参数  直接调拨单-先进先出控制
                    {
                        DataSet FIFO = oCn.RunProcReturn("exec h_p_WMS_AddSourceFIFO_MoveStock " + HInterID.ToString() + ",'" + HBillType + "','" + HSourceBillNo + "','" + HSourceBillType + "'," + HFIFOWhID.ToString() + "," + HOWNERID.ToString(), "h_p_WMS_AddSourceFIFO_MoveStock");
                        if (FIFO == null || FIFO.Tables[0].Rows.Count == 0)
                        {
                            sErrMsg = "单据号：" + HBillNo + "，单据ID：" + HInterID + "；存入先进先出临时表失败！";
                            return null;
                        }
                        else
                        {
                            if (DBUtility.ClsPub.isLong(FIFO.Tables[0].Rows[0][0]) == 1)
                            {
                                sErrMsg = "单据号：" + HBillNo + "，单据ID：" + HInterID + "；" + DBUtility.ClsPub.isStrNull(FIFO.Tables[0].Rows[0]["HRemark"]);
                                return null;
                            }
                        }
                    }
                    //先进先出下架清单
                    else if (oSystemParameter.omodel.Kf_MoveStockBill_FIFOList == "Y")  //系统参数  直接调拨单-先进先出下架清单
                    {
                        DataSet FIFOList = oCn.RunProcReturn("exec h_p_WMS_AddSourceFIFOList_MoveStock " + HInterID.ToString() + ",'" + HBillType + "','" + HSourceBillNo + "','" + HSourceBillType + "'," + HFIFOWhID.ToString() + "," + HOWNERID.ToString(), "h_p_WMS_AddSourceFIFOList_MoveStock");
                        if (FIFOList == null || FIFOList.Tables[0].Rows.Count == 0)
                        {
                            sErrMsg = "单据号：" + HBillNo + "，单据ID：" + HInterID + "；存入先进先出下架清单失败！";
                            return null;
                        }
                        else
                        {
                            if (DBUtility.ClsPub.isLong(FIFOList.Tables[0].Rows[0][0]) == 1)
                            {
                                sErrMsg = "单据号：" + HBillNo + "，单据ID：" + HInterID + "；" + DBUtility.ClsPub.isStrNull(FIFOList.Tables[0].Rows[0]["HRemark"]);
                                return null;
                            }
                        }
                    }
                    oBar.HBarType = "源单条码";
                    oBar.HMulSourceFlag = sMulSourceFlag;
                    oBar.HSourceBillType = DBUtility.ClsPub.isStrNull(ds1.Tables[0].Rows[0]["HSourceBillType"]);
@@ -54752,7 +54716,7 @@
                    || 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 == "森楷")
            {
                oBar = get_CheckTypeByBarCode_All(sBarCode, HInterID, HBillType, HBillNo, HMaker, HWhID, HSPID, HQty, HRedBlueFlag, SourceFlag, HSourceBillNo, HSourceBillType, HStockOrgID, HCustom1, ref sErrMsg);
@@ -58859,46 +58823,6 @@
                {
                    if (DBUtility.ClsPub.isLong(Source.Tables[0].Rows[0][0]) == 0)
                    {
                        //先进先出控制
                        if (oSystemParameterMain.Kf_MoveStockBill_FIFOCtl == "Y")  //系统参数  直接调拨单-先进先出控制
                        {
                            DataSet FIFO = oCn.RunProcReturn("exec h_p_WMS_AddSourceFIFO_MoveStock " + HBillID.ToString() + ",'" + HBillType + "','" + omodel_View.HSourceBillNo + "','" + omodel_View.HSourceBillType + "',0," + HStockOutOrgID.ToString(), "h_p_WMS_AddSourceFIFO_MoveStock");
                            if (FIFO == null || FIFO.Tables[0].Rows.Count == 0)
                            {
                                sErrMsg = "单据号：" + HBillNo + "，单据ID：" + HBillID + "；存入先进先出临时表失败！";
                                oCn.RollBack();
                                return null;
                            }
                            else
                            {
                                if (DBUtility.ClsPub.isLong(FIFO.Tables[0].Rows[0][0]) == 1)
                                {
                                    sErrMsg = "单据号：" + HBillNo + "，单据ID：" + HBillID + "；" + DBUtility.ClsPub.isStrNull(FIFO.Tables[0].Rows[0]["HRemark"]);
                                    oCn.RollBack();
                                    return null;
                                }
                            }
                        }
                        //先进先出下架清单
                        else if (oSystemParameterMain.Kf_MoveStockBill_FIFOList == "Y")  //系统参数  直接调拨单-先进先出下架清单
                        {
                            DataSet FIFOList = oCn.RunProcReturn("exec h_p_WMS_AddSourceFIFOList_MoveStock " + HBillID.ToString() + ",'" + HBillType + "','" + omodel_View.HSourceBillNo + "','" + omodel_View.HSourceBillType + "',0," + HStockOutOrgID.ToString(), "h_p_WMS_AddSourceFIFOList_MoveStock");
                            if (FIFOList == null || FIFOList.Tables[0].Rows.Count == 0)
                            {
                                sErrMsg = "单据号：" + HBillNo + "，单据ID：" + HBillID + "；存入先进先出下架清单失败！";
                                oCn.RollBack();
                                return null;
                            }
                            else
                            {
                                if (DBUtility.ClsPub.isLong(FIFOList.Tables[0].Rows[0][0]) == 1)
                                {
                                    sErrMsg = "单据号：" + HBillNo + "，单据ID：" + HBillID + "；" + DBUtility.ClsPub.isStrNull(FIFOList.Tables[0].Rows[0]["HRemark"]);
                                    oCn.RollBack();
                                    return null;
                                }
                            }
                        }
                        oBar.HBarType = "物料条码";
                        oBar.HMulSourceFlag = 1;
                        oBar.HSourceBillType = DBUtility.ClsPub.isStrNull(Source.Tables[0].Rows[0]["HSourceBillType"]);
@@ -58919,16 +58843,23 @@
                        oBar.HSCWhName = DBUtility.ClsPub.isStrNull(Source.Tables[0].Rows[0]["HSCWhName"]);
                        oBar.HSCSPFlag = DBUtility.ClsPub.isBool(Source.Tables[0].Rows[0]["HSCSPFlag"]);
                        SourceFlag = true;
                        if(oBar.HStockInOrgID!=0 && oBar.HStockInOrgID!=HStockInOrgID && HWhID!=0)
                        {
                            sErrMsg = "所选调入组织与条码对应调拨申请单调入组织不一致，请重新选择调入组织、调入仓库！";
                            oCn.RollBack();
                            return null;
                        }
                        //界面所选调入组织与源单调入组织不一致时，获取调入组织ID为源单调入组织ID
                        //if(oBar.HStockInOrgID!=0 && oBar.HStockInOrgID!=HStockInOrgID && HWhID!=0)
                        //{
                        //    sErrMsg = "所选调入组织与条码对应调拨申请单调入组织不一致，请重新选择调入组织、调入仓库！";
                        //    oCn.RollBack();
                        //    return null;
                        //}
                        //界面所选调入组织与源单调入组织不一致时，获取调入组织ID为源单调入组织ID，调入仓库ID默认为0
                        if (oBar.HStockInOrgID != 0 && oBar.HStockInOrgID != HStockInOrgID)
                        {
                            HStockInOrgID = oBar.HStockInOrgID;
                            HWhID = 0;
                        }
                        //界面所选调出组织与源单调出组织不一致时，获取调出组织ID为源单调出组织ID，调出仓库ID默认为0
                        if (oBar.HStockOutOrgID != 0 && oBar.HStockOutOrgID != HStockOutOrgID)
                        {
                            HStockOutOrgID = oBar.HStockOutOrgID;
                            HSCWHID = 0;
                        }
                    }
                    else
@@ -59159,32 +59090,6 @@
                oMain.HCusBarCode = HCustom1;
                oMain.HMulSourceBill = 1;
                oMain.HSubBillType = "1243";

                //先进先出控制
                if (HSourceBillType != "-1" && HBillType != "1251" && sFIFOCtl == "Y")
                {
                    //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");
                    DataSet FIFO = oCn.RunProcReturn("exec h_p_WMS_FIFOCheck " + HBillID.ToString() + ",'" + HBillType + "','" + oMain.HBatchNo + "','" + oMain.HBarCode + "'," + oMain.HQty.ToString() + "," + oMain.HSCWHID.ToString() + "," + oMain.HOutStockPlaceID.ToString(), "h_p_WMS_FIFOCheck");
                    if (FIFO == null || FIFO.Tables[0].Rows.Count == 0)
                    {
                        sErrMsg = "判断先进先出控制发生错误！";
                        oCn.RollBack();
                        return null;
                    }
                    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"]);
                            oCn.RollBack();
                            return null;
                        }
                    }
                }

                oCn.RunProc("Insert into KF_PonderationBillMain_Temp " +
                    "(HInterID,HBillNo,HBillType,HMaterID,HUnitID,HAuxPropID,HProcID" +