解决合并冲突

chenhaozhe

2025-05-26 29bf38f64c14321cf435e897c396111e92ab03a7

 WebAPI/Models/ClsSc_MESBeginWorkBillMain.cs

@@ -31,11 +31,12 @@
        public String HBarCodeMaker;
        public DateTime HBarCodeMakeDate;
        new public string HMainSourceEntryID;

        public string HRunStatus;
        public decimal HSourceBeginQty;
        //public int HSourceInterID_Main;
        //public int HSourceEntryID_Main;
        //public string HSourceBillNo_Main;
        //public string HSourceBillType_Main;

        public int HWorkShiftID;
    }
}