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

zgq

2021-07-21 d4795e2359ff150cd1fd6a1a8a5b798d8e37c373

 WebAPI/DLL/ClsSc_ICMOBillWorkQtyStatus_Tmp.cs

@@ -77,14 +77,19 @@
                //若MAINDI重复则重新获取
                oCn.BeginTran();
                //主表

                oCn.RunProc("Insert Into Sc_ICMOBillWorkQtyStatus_Tmp   " +
                "(HInterID,HBillType,HSourceID,HReportType,HPieceQty" +
                ",HQty,HBarCode,HAddr,HMaker,HMakeDate" +
                ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSplitNO,HSourceBillType" +
                ",HRelationInterID,HRelationEntryID,HRelationBillNo,HReportEntryID" +
                ") " +
               "(HInterID,HBillType,HSourceID,HReportType,HPieceQty" +
               ",HMaterID,HGroupID,HWorkManID,HWorkReportDate,HDate" +
               ",HBillSubType,HBillNo,HICMOInterID,HICMOEntryID,HICMOBillNo" +
               ",HQty,HBadQty,HWasterQty,HBarCode,HAddr,HMaker,HMakeDate" +
               ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSplitNO,HSourceBillType" +
               ",HRelationInterID,HRelationEntryID,HRelationBillNo,HReportEntryID" +
               ") " +
                " values(" + omodel.HInterID.ToString() + ",'" + BillType + "'," + omodel.HSourceID.ToString() + "," + omodel.HReportType.ToString() + "," + omodel.HPieceQty.ToString() +
                "," + omodel.HQty.ToString() + ",'" + omodel.HBarCode + "','" + omodel.HAddr + "','" + DBUtility.ClsPub.CurUserName + "','" + DBUtility.ClsPub.GetServerDate(-1) + "'" +
                "," + omodel.HMaterID.ToString() + ",'" + omodel.HGroupID + "','" + omodel.HWorkManID + "','" + omodel.HWorkReportDate + "','" + omodel.HDate + "'" +
                ",'" + omodel.HBillSubType.ToString() + "','" + omodel.HBillNo + "','" + omodel.HICMOInterID + "','" + omodel.HICMOEntryID + "','" + omodel.HICMOBillNo + "'" +
                "," + omodel.HQty.ToString() + "," + omodel.HBadQty.ToString() + "," + omodel.HWasterQty.ToString() + ",'" + omodel.HBarCode + "','" + omodel.HAddr + "','" + omodel.HMaker+ "','" + omodel.HMakeDate + "'" +
                "," + omodel.HSourceInterID.ToString() + "," + omodel.HSourceEntryID.ToString() + ",'" + omodel.HSourceBillNo + "','" + omodel.HSplitNO + "','" + omodel.HSourceBillType + "'" +
                "," + omodel.HRelationInterID.ToString() + "," + omodel.HRelationEntryID.ToString() + ",'" + omodel.HRelationBillNo + "'," + omodel.HReportEntryID.ToString() + 
                ") ");
@@ -123,7 +128,7 @@
                omodel.HBarCode = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBarCode"]);
                omodel.HAddr = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HAddr"]);
                omodel.HMaker = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMaker"]);
                omodel.HMakeDate = DBUtility.ClsPub.isDate(Ds.Tables[0].Rows[0]["HMakeDate"]);
                omodel.HMakeDate = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMakeDate"]);
                omodel.HSourceInterID = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HSourceInterID"]);
                omodel.HSourceEntryID = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HSourceEntryID"]);
                omodel.HSourceBillNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HSourceBillNo"]);