直接调拨单校验扫码模块，新增扫描物料条码功能：源单中存在多行相同物料时自动拆分换行匹配源单数据

yxj

2022-07-28 202f048d2c23d581f304d2332a35a0b0184ec0a8

直接调拨单校验扫码模块，新增扫描物料条码功能：源单中存在多行相同物料时自动拆分换行匹配源单数据

 CLOUDWEB/WebService1.asmx.cs

@@ -40320,8 +40320,15 @@
                sWHSPCtl = "N";
            }

            string sMultilineCtl = "N";   //校验-多行相同物料自动拆分换行匹配（'Y'为自动拆分）
            if (HBillType == "1207" && oSystemParameterMain.Kf_MoveStockBillCheck_MultilineCtl == "Y")
            {
                //直接调拨单
                sMultilineCtl = "Y";
            }

            //判断是否存在相同条码，判断所扫条码是否在单据中
            DataSet ds1 = oCn.RunProcReturn("exec h_p_WMS_AddBarCode_MoveStockBillCheck '" + omodel_View.HBarCode + "'," + HBillID.ToString() + ",'" + HBillNo + "','" + HBillType + "'," + HWhID + "," + HSPID + "," + HSCWHID + "," + HSCSPID + ",'" + sWHSPCtl + "'", "h_p_WMS_AddBarCode_MoveStockBillCheck");
            DataSet ds1 = oCn.RunProcReturn("exec h_p_WMS_AddBarCode_MoveStockBillCheck_New '" + omodel_View.HBarCode + "'," + HBillID.ToString() + ",'" + HBillNo + "','" + HBillType + "'," + HWhID + "," + HSPID + "," + HSCWHID + "," + HSCSPID + ",'" + sWHSPCtl + "','" + sMultilineCtl + "'", "h_p_WMS_AddBarCode_MoveStockBillCheck_New");
            if (ds1 == null || ds1.Tables[0].Rows.Count == 0)
            {
                sErrMsg = "判断所扫条码是否在单据中发生错误！";
@@ -40332,10 +40339,7 @@
                if (DBUtility.ClsPub.isLong(ds1.Tables[0].Rows[0][0]) == 0)
                {
                    omodel_View.HMaterID = DBUtility.ClsPub.isLong(ds1.Tables[0].Rows[0]["HMaterID"]);
                    omodel_View.HSourceBillNo = DBUtility.ClsPub.isStrNull(ds1.Tables[0].Rows[0]["HSourceBillNo"]);
                    omodel_View.HSourceEntryID = DBUtility.ClsPub.isLong(ds1.Tables[0].Rows[0]["HSourceEntryID"]);
                    omodel_View.HSourceInterID = DBUtility.ClsPub.isLong(ds1.Tables[0].Rows[0]["HSourceInterID"]);
                    omodel_View.HSourceQty = DBUtility.ClsPub.isDoule(ds1.Tables[0].Rows[0]["HQtyMust"]);     //源单可扫数量
                    omodel_View.HSourceQty = DBUtility.ClsPub.isDoule(ds1.Tables[0].Rows[0]["HSumQtyMust"]);     //HSumQtyMust为源单相同物料剩余可扫数量
                    HWhID = DBUtility.ClsPub.isLong(ds1.Tables[0].Rows[0]["HWhID"]);
                    HSPID = DBUtility.ClsPub.isLong(ds1.Tables[0].Rows[0]["HSPID"]);
                    HSCWHID = DBUtility.ClsPub.isLong(ds1.Tables[0].Rows[0]["HSCWHID"]);
@@ -40478,13 +40482,46 @@
                }
            }

            double sSumQty = 0;
            double sRemQty = 0;
            for (int i = 0; i < ds1.Tables[0].Rows.Count; i++)
            {
                omodel_View.HSourceQty = DBUtility.ClsPub.isDoule(ds1.Tables[0].Rows[i]["HQtyMust"]);   //存在相同物料时，其中一行源单剩余可扫数量
                sSumQty = sSumQty + omodel_View.HSourceQty;
                sRemQty = sRelQty - sSumQty;

                //数量
                //只存在一行数据时，数量=条码可扫数量
                if (ds1.Tables[0].Rows.Count==1)
                {
                    oMain.HQty = sRelQty;
                }
                //存在多行相同物料，条码剩余数量<所选行源单剩余可扫数量 或 所选行源单为最后一条数据时 ，数量=条码剩余数量
                else if (sRemQty <= 0 || (i == ds1.Tables[0].Rows.Count-1 && sRemQty > 0))
                {
                    oMain.HQty = sRemQty + omodel_View.HSourceQty;
                }
                //存在多行相同物料，条码剩余数量>所选行源单剩余可扫数量 ，数量=所选行源单剩余可扫数量
                else
                {
                    oMain.HQty = omodel_View.HSourceQty;
                }
                //条码条数
                if (i == 0)
                {
                    oMain.HPieceQty = 1;
                }
                else
                {
                    oMain.HPieceQty = 0;
                }

            oMain.HInterID = HBillID;
            oMain.HBillNo = HBillNo;
            oMain.HBillType = HBillType;
            oMain.HMaker = HMaker;
            oMain.HMaterID = omodel_View.HMaterID;
            oMain.HAuxPropID = omodel_View.HAuxPropID;
            oMain.HQty = sRelQty;
            oMain.HQtyMust = 0;
            oMain.HBarCode = omodel_View.HBarCode;
            oMain.HBatchNo = omodel_View.HBatchNo;
@@ -40493,12 +40530,11 @@
            oMain.HStockPlaceID = HSPID;
            oMain.HSCWHID = HSCWHID;
            oMain.HOutStockPlaceID = HSCSPID;
            oMain.HSourceInterID = omodel_View.HSourceInterID;
            oMain.HSourceEntryID = omodel_View.HSourceEntryID;
            oMain.HSourceBillNo = omodel_View.HSourceBillNo;
                oMain.HSourceInterID = DBUtility.ClsPub.isLong(ds1.Tables[0].Rows[i]["HSourceInterID"]);
                oMain.HSourceEntryID = DBUtility.ClsPub.isLong(ds1.Tables[0].Rows[i]["HSourceEntryID"]);
                oMain.HSourceBillNo = DBUtility.ClsPub.isStrNull(ds1.Tables[0].Rows[i]["HSourceBillNo"]);
            oMain.HSourceBillType = HBillType;
            oMain.HRedBlueFlag = false;
            oMain.HPieceQty = 1;
            oMain.HSTOCKORGID = HOWNERID;
            oMain.HOWNERID = HOWNERID;

@@ -40517,6 +40553,12 @@
                "," + oMain.HRelationInterID.ToString() + "," + oMain.HRelationEntryID.ToString() + ",'" + oMain.HRelationBillNo + "'," + Convert.ToString(oMain.HRedBlueFlag ? 1 : 0) + ",'" + oMain.HMTONo + "',0" +
                "," + oMain.HSTOCKORGID.ToString() + "," + oMain.HSTOCKORGID.ToString() + "," + oMain.HOWNERID.ToString() + ",'','校验模式',1" +
                ",0,0,'" + oMain.HCusBarCode + "',0)");

                if (sRemQty <= 0)
                {
                    break;
                }
            }
            return true;
        }


 DLL/Pub_Class.dll

Binary files differ