新增扫描班组条码调用方法，新增生产汇报单上传方法，新增生产汇报、委外入库扫描源单条码调用方法

yxj

2024-02-21 2148a6167e10dfd99e143fbf509be96f2bc8e369

 WebAPI/Controllers/SCGL/Sc_ICMOChangeBillController.cs

@@ -48,12 +48,12 @@

                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_Sc_ICMOChangeBillList_Query order by 单据号 ", "h_v_Sc_ICMOChangeBillList_Query");
                    ds = oCN.RunProcReturn("select * from h_v_Sc_ICMOChangeBillList_Query order by 单据号 desc", "h_v_Sc_ICMOChangeBillList_Query");
                }
                else
                {
                    string sql1 = "select * from h_v_Sc_ICMOChangeBillList_Query where 1 = 1 ";
                    string sql = sql1 + sWhere + " order by 单据号 ";
                    string sql = sql1 + sWhere + " order by 单据号 desc";
                    ds = oCN.RunProcReturn(sql, "h_v_Sc_ICMOChangeBillList_Query");
                }

@@ -311,6 +311,8 @@
        {
            try
            {
                string s = "";

                //查看权限
                if (!DBUtility.ClsPub.Security_Log("Sc_ICMOChangeBill_Drop", 1, false, user))
                {
@@ -327,6 +329,24 @@
                    objJsonResult.count = 0;
                    objJsonResult.Message = "HInterID不能为空！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (BillOld.ShowBill(long.Parse(HInterID), ref s) == false)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "此单据有误！";
                    objJsonResult.data = 1;
                    return objJsonResult;
                }
                //判断是否可编辑
                if (BillOld.omodel.HChecker != "" && BillOld.omodel.HChecker != null)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "此单据已经被审核，不允许删除！";
                    objJsonResult.data = 1;
                    return objJsonResult;
                }

@@ -448,9 +468,55 @@
                //进行需要进行的审核/反审核操作
                if (IsAudit == 0) //审核提交
                {
                    //检验子表数据
                    string errorMessage = "";
                    foreach (Model.ClsSc_ICMOChangeBillSub oSub in oBill.DetailColl)
                    {
                        //判断新数量是否小于单据关联数量
                        if (oSub.HQty_New < oSub.HRelationQty)
                        {
                            errorMessage += "物料新数量小于单据被关联数量!";
                        }
                    }
                    if (errorMessage != "")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "审核失败!原因:" + errorMessage;
                        objJsonResult.data = null;
                        return objJsonResult;
                    }

                    //检查源单是否存在
                    string sql = "select * from Sc_ICMOBillSub where HInterID = " + oBill.omodel.HMainSourceInterID + " and HEntryID =" + oBill.omodel.HMainSourceEntryID;
                    ds = oCN.RunProcReturn(sql, "Sc_ICMOBillSub");
                    if(ds==null || ds.Tables[0].Rows.Count == 0)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "审核失败!原因:源单数据不存在！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    else if (ds.Tables[0].Rows[0]["HBillStatus"].ToString() != "2")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "审核失败!原因:源单未处于审核状态!";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }

                    oCN.BeginTran();
                    //反写源单数据
                    sql = "exec h_p_Sc_ICMOBill_ReWriteByICMOChangeBill " + oBill.omodel.HInterID;
                    oCN.RunProc(sql);

                    //审核提交
                    if (oBill.CheckBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
                    {
                        oCN.Commit();

                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "审核成功";
@@ -459,6 +525,8 @@
                    }
                    else
                    {
                        oCN.RollBack();

                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "审核失败!原因:" + DBUtility.ClsPub.sExeReturnInfo;
@@ -490,6 +558,8 @@
            }
            catch (Exception e)
            {
                oCN.RollBack();

                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "审核失败或者反审核失败！" + e.ToString();