解决合并冲突

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
using System;
using System.Collections.Generic;
using System.Text;
 
namespace WebAPI.Models
{
    public class ClsKf_MateOutBillMain:DBUtility.ClsXt_BaseBillMain
    {
        public Int64 HSupID;//   int                --¹©Ó¦ÉÌ
        public Int64 HWHID;//    int                 --²Ö¿â
        public Int64 HSCWHID;//  int                   --µ÷³ö²Ö¿â   
        public Int64 HEmpID;//    int                --ÒµÎñÔ±
        public Int64 HManagerID;//   int            --¸ºÔðÈË
        public Int64 HSecManagerID;//  int           --ÑéÊÕ
        public Int64 HKeeperID;//   int             --±£¹ÜÔ±
        public Int64 HDeptID;//     int             --²¿ÃÅ
        public string HExplanation;//   varchar(200)        --ÕªÒª
        public string HInnerBillNo;//  varchar(50)         --ÄÚ²¿µ¥¾ÝºÅ
        public bool HRedBlueFlag;//  bit            --ºìÀ¶µ¥
 
        public Int64 HICMOInterID;          //int   --ÈÎÎñµ¥ÄÚÂë
        public Int64 HICMOEntryID;          //int   --ÈÎÎñµ¥×ÓÄÚÂë
        public string HICMOBillNo;          //int   --ÈÎÎñµ¥ºÅ
        public Int64 HProcExchInterID;      //int   --¹¤ÐòÁ÷ת¿¨ÄÚÂë
        public Int64 HProcExchEntryID;      //int   --¹¤ÐòÁ÷ת¿¨×ÓÄÚÂë
        public string HProcExchBillNo;      //int   --¹¤ÐòÁ÷ת¿¨ºÅ
        public Int64 HMaterID;              //int   --Ö÷²úÆ·ÄÚÂë
        public string HMaterName;           //varchar(100)  --ÑÕÉ«
        public string HVerNo;               //varchar(50)   --»¨°æºÅ
        public string HModel;               //varchar(100)  --¹æ¸ñÐͺÅ1
        public string HModel2;              //varchar(100)  --¹æ¸ñÐͺÅ2
        public string HPieceQty;            //varchar(20)   --Ö»Êý
        public Int64 HCusID;                //int           --¿Í»§
        public double HWeight;              //dec(18,8)     --ÖØÁ¿
        public double HLong;                //dec(18,8)     --Ã×Êý
        public double HSingleWeigth;        //dec(18,8)     --µ¥Í°ÖØÁ¿
        public double HMaterSumWeight;      //dec(18,8)     --×ܽ¬ÖØÁ¿
        public Int64 HMaterEmpID;           //int           --´ò½¬ÈË
 
        public double HMachineSpeed;        //dec(18,8)     --»úËÙ
        public double HWaterRush;           //dec(18,8)     --Ë®³å
        public double HWaterQty;            //dec(18,8)     --Ë®Á¿
        public double HWaterRate;           //dec(18,8)     --Ë®±È
    }
}