解决合并冲突

chenhaozhe

2025-06-12 579d2b489f9565f6e506ddbef634d65aa20dc27e

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
using System;
using System.Collections.Generic;
using System.Text;
 
namespace WebAPI.Models
{
    public class ClsSc_ICMOReportBillSub : DBUtility.ClsXt_BaseBillSub
    {
        public Int64 HMaterID;
        public string HMaterNumber;
        public Int64 HUnitID;
        public string HUnitNumber;
        public double HQtyMust;
        public double HQty;              //ÊýÁ¿
        public Int64 HWorkerID;
        public string HWorkerNumber;
        public Int64 HSourceID;
        public Single HTimes;         //     
        public string HRemark;
        public double HBadCount;
        public double HWasterQty;
        public string HCloseMan;
        public DateTime HEntryCloseDate;
        public bool HCloseType;
        // 
        public Int64 HICMOInterID;
        public string HICMOBillNo;
        public Int64 HSeOrderInterID;
        public Int64 HSeOrderEntryID;
        public string HSeOrderBillNo;
        public string HSplitNO;
        public string HBarCode;
        public Int64 HBadQty;
 
        public string HOWNERTYPEID;  //»õÖ÷ÀàÐÍ,
        public Int64 HISENTRUST;    //×é֯ίÍмӹ¤,
        public Int64 HSTOCKINORGID;    //Èë¿â×éÖ¯,
        public Int64 HOWNERID;  //»õÖ÷,
        public Int64 HCHECKPRODUCT;    //²úÆ·¼ìÑé,
        public string HQAIP; //½ô¼±·ÅÐÐ,
        public decimal HCOSTRATE;    //³É±¾È¨ÖØ
        public Int64 HISBACKFLUSH;    //µ¹³åÁìÁÏ
        public string HREQSRC;  //ÐèÇóÀ´Ô´
        public string HREQBILLNO;  //ÐèÇ󵥺Å
        public Int64 HREQBILLID;    //ÐèÇóµ¥ÄÚÂë
        public Int64 HREQENTRYSEQ;    //ÐèÇóµ¥¾ÝÐкÅ
        public Int64 HREQENTRYID;    //ÐèÇóµ¥¾Ý×ÓÄÚÂë
        public Int64 HMOMAINENTRYID;//Éú²ú¶©µ¥Ö÷²úÆ··Ö¼
        public double HSTOCKINQUASELQTY; //Èë¿âÑ¡µ¥ÊýÁ¿
        public Int64 HPRODUCTTYPE;//²úÆ·ÀàÐÍ,
        public string HPROJECTNO;  //ÏîÄ¿±àºÅ
        public Int64 HICMOENTRYSEQ;    //Éú²ú¶©µ¥ÐкÅ
        public Int64 HSEQ;        //ÐкÅ
        public string HPRODUCEDATE;//Éú²úÈÕÆÚ
        public string HEXPIRYDATE;//ÓÐЧÆÚÖÁ
        public Int64 HBASEUNITID;    //»ù±¾¼ÆÁ¿µ¥Î»,
        public Int64 HDEPTID;//³µ¼ä²¿ÃÅ,
        public Int64 HGroupID;//°à×é,
        public string HDESCRIPTION;//ÕªÒª±¸×¢
 
        public string HSourceNumber;
        public double HQPQty;
        public Int64 HSourceInterID;
        public Int64 HSourceEntryID;
        public string HSourceBillNo;
        public string HSourceBillType;
        public Int64 HICMOEntryID;
        public double HRelationQty;
        public double HRelationMoney;
        public Int64 HWhID;
        public Int64 HSPID;
        public string HBatChNo;
        public Int64 HAuxPropID;
        public string HMTONo;
        public Int64 HPlanMode;
        public Int64 HERPInterID;
        public Int64 HERPEntryID;
        public Int64 HICMOTempID;
    }
}