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

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");
                }

@@ -498,14 +498,23 @@
                        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.BeginTran();
                        sql = "exec h_p_Sc_ICMOBill_ReWriteByICMOChangeBill " + oBill.omodel.HInterID;
                        oCN.RunProc(sql);
                        oCN.Commit();

                        objJsonResult.code = "1";
@@ -516,6 +525,8 @@
                    }
                    else
                    {
                        oCN.RollBack();

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

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