Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

jinghz@oceic.com

2023-08-24 c5cfa2df88c6d2e5b31e87e1d5a8fe49d585f0bb

 DAL/MES/ClsSc_ICMOBillQualityStatus_Tmp.cs

@@ -102,6 +102,71 @@
                throw (e);
            }
        }

        //新增单据
        public bool AddBill1(ref string sReturn)
        {
            try
            {
                //若MAINDI重复则重新获取
                oCn.BeginTran();
                string sql = "Insert into Sc_ICMOBillQualityStatus_Tmp"+ 
                                "(HBarCode,HInterID,HBillNo,HCheckManID,HBadReasonID,HWasterReasonID,HResult,HAddr," +
                                "HRemark,HSaveType,HICMOInterID,HICMOEntryID,HICMOBillNo,HSplitNo,HMaterID,HProcID,HSourceID,HDate,HGroupID,HDeptID,HStationID," +
                                "HPRDORGID,HAuxPropID,HBillType,HBillSubType,HReportType,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationInterID," +
                                "HRelationEntryID,HRelationBillNo,HMaker,HMakeDate)" +
                                "values(" +
                                "'" + omodel.HBarCode +
                                "'," + omodel.HInterID +
                                ",'" + omodel.HBillNo +
                                "'," + omodel.HCheckManID +
                                "," + omodel.HBadReasonID +
                                "," + omodel.HWasterReasonID +
                                ",'" + omodel.HResult +
                                "','" + omodel.HAddr +
                                "','" + omodel.HRemark +
                                "','" + omodel.HSaveType +
                                "'," + omodel.HICMOInterID +
                                "," + omodel.HICMOEntryID +
                                ",'" + omodel.HICMOBillNo +
                                "','" + omodel.HSplitNO +
                                "'," + omodel.HMaterID +
                                "," + omodel.HProcID +
                                "," + omodel.HSourceID +
                                ",'" + omodel.HDate +
                                "'," + omodel.HGroupID +
                                "," + omodel.HDeptID +
                                "," + omodel.HStationID +
                                "," + omodel.HPRDORGID +
                                "," + omodel.HAuxPropID +
                                ",'" + BillType +
                                "','" + "" +
                                "'," + omodel.HReportType +
                                "," + omodel.HSourceInterID +
                                "," + omodel.HSourceEntryID +
                                ",'" + omodel.HSourceBillNo +
                                "','" + omodel.HSourceBillType +
                                "'," + omodel.HRelationInterID +
                                "," + omodel.HRelationEntryID +
                                ",'" + omodel.HRelationBillNo +
                                "','" + omodel.HMaker +
                                "','" + omodel.HMakeDate +
                                "')";

                //主表
                oCn.RunProc(sql);
                sReturn = "新增单据成功！";
                oCn.Commit();
                return true;
            }
            catch (Exception e)
            {
                sReturn = e.Message;
                oCn.RollBack();
                throw (e);
            }
        }

        //显示单据
        public override bool ShowBill(Int64 lngBillKey, ref string sReturn)
        {