From d1526dc9e4666e426c1314756e43ed85b5cc4439 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 05 十二月 2022 00:57:58 +0800
Subject: [PATCH] 单据新增字段
---
WebAPI/Controllers/SCGL/Sc_PPBomBillController.cs | 4
WebAPI/Models/ClsSc_ICMOReportBillSub.cs | 46 +++++++++
Model/生产管理/ClsSc_ICMOBillSub.cs | 12 ++
Model/采购管理/ClsCg_POOrderBillSub.cs | 71 ++++++++++---
Model/生产管理/设备管理/ClsSc_ICMOBillMain.cs | 3
WebAPI/Models/ClsGy_Material_Model.cs | 10 ++
WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs | 58 ++++++++++
Model/采购管理/ClsCg_POOrderBillMain.cs | 31 ++++--
WebAPI/DLL/ClsSc_ICMOReportBill.cs | 19 +++
WebAPI/Models/ClsSc_ICMOReportBillMain.cs | 4
WebAPI/Controllers/生产管理/生产任务单/Sc_ICMOBillController.cs | 25 ++++
WebAPI/DLL/ClsGy_Material_Ctl.cs | 17 ++
12 files changed, 253 insertions(+), 47 deletions(-)
diff --git "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_ICMOBillSub.cs" "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_ICMOBillSub.cs"
index ec51d91..31eaf60 100644
--- "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_ICMOBillSub.cs"
+++ "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_ICMOBillSub.cs"
@@ -20,5 +20,17 @@
public DateTime? HEndDate;
public Int64 HBomID;
public Int64 HCusID;
+
+ public string HINSTOCKTYPE; //入库类型,
+ public Int64 HCHECKPRODUCT; //产品检验,
+ public string HQAIP; //紧急放行,
+ public Int64 HISBACKFLUSH; //倒冲领料,
+ public string HREQSRC; //需求来源,
+ public double HSTOCKINQUASELAUXQTY; //合格品入库选单数量,
+ public Int64 HSeOrderEntrySEQ; //销售订单行号,
+ public string HPROJECTNO; //项目编号,
+ public Int64 HPRODUCTTYPE; //产品类型,
+ public Int64 HCOSTRATE; // 权重,
+ public Int64 HBASEUNITID; //基本计量单位,
}
}
diff --git "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSc_ICMOBillMain.cs" "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSc_ICMOBillMain.cs"
index a0a7293..0b1ba82 100644
--- "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSc_ICMOBillMain.cs"
+++ "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSc_ICMOBillMain.cs"
@@ -36,5 +36,8 @@
public double HRelationQty;
public string HOrderProcNo;//订单跟踪号
+ public Int64 HISENTRUST; //组织受托加工
+ public Int64 HISREWORK; //是否返工
+
}
}
diff --git "a/Model/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_POOrderBillMain.cs" "b/Model/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_POOrderBillMain.cs"
index 19c3d92..5366e8e 100644
--- "a/Model/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_POOrderBillMain.cs"
+++ "b/Model/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_POOrderBillMain.cs"
@@ -6,17 +6,17 @@
{
public class ClsCg_POOrderBillMain:DBUtility.ClsXt_BaseBillMain
{
- public string HAddress;// varchar(200) --交货地点
- public Int64 HSSID;// int --结算方式 (Gy_SettleStyle)
- public Int64 HPSStyleID;// int --采购方式 (Gy_PoStockStyle) new
- public Int64 HSupID;// int --供应商 （Gy_Supplier）
- public Int64 HCurID;// int --币别 (Gy_Currency)
- public Single HExRate;// money --汇率 (选择完币别带出)
- public Int64 HEmpID;// int --业务员 (Gy_Employee)
- public Int64 HManagerID;// int --主管 (Gy_Employee)
- public Int64 HDeptID;// int --部门 (Gy_Employee)
- public string HExplanation;// varchar(200) --摘要
- public string HInnerBillNo;// varchar(50) --内部单据号
+ public string HAddress;// varchar(200) //交货地点
+ public Int64 HSSID;// int //结算方式 (Gy_SettleStyle)
+ public Int64 HPSStyleID;// int //采购方式 (Gy_PoStockStyle) new
+ public Int64 HSupID;// int //供应商 （Gy_Supplier）
+ public Int64 HCurID;// int //币别 (Gy_Currency)
+ public Single HExRate;// money //汇率 (选择完币别带出)
+ public Int64 HEmpID;// int //业务员 (Gy_Employee)
+ public Int64 HManagerID;// int //主管 (Gy_Employee)
+ public Int64 HDeptID;// int //部门 (Gy_Employee)
+ public string HExplanation;// varchar(200) //摘要
+ public string HInnerBillNo;// varchar(50) //内部单据号
public DateTime HSSDate; //结算日期
public string HRemark; //备注
@@ -37,5 +37,14 @@
public string HERPBillType;
public Int64 HPURCHASEORGID;
+ public Int64 HPURCHASERGROUPID; //采购组
+ public Int64 HPROVIDERID; //供货方
+ public Int64 HSETTLEID;//结算方
+ public Int64 HCHARGEID;//收款方
+ public string HBUSINESSTYPE; //业务类型
+ public string HPROVIDERADDRESS; //供货方地址
+ public Int64 HCORRESPONDORGID; //对应组织
+ public Int64 HPROVIDERCONTACTID;//供货方联系人
+
}
}
diff --git "a/Model/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_POOrderBillSub.cs" "b/Model/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_POOrderBillSub.cs"
index ad0ee62..ceee7ab 100644
--- "a/Model/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_POOrderBillSub.cs"
+++ "b/Model/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_POOrderBillSub.cs"
@@ -6,26 +6,26 @@
{
public class ClsCg_POOrderBillSub:DBUtility.ClsXt_BaseBillSub
{
- public DateTime HEntryCloseDate;// datetime --行关闭 (默认为'') new
- public string HRemark;// varchar(200) --备注
- public Int64 HMaterID;// int --物料ID (Gy_Material)
- public Int64 HUnitID;// int --计量单位 (Gy_Unit)
- public double HQty;// dec(18,8) --数量
- public double HPrice;// dec(18,8) --原币单价
- public double HMoney;// dec(18,8) --原币金额
- public Single HTaxRate;// money --税率
+ public DateTime HEntryCloseDate;// datetime //行关闭 (默认为'') new
+ public string HRemark;// varchar(200) //备注
+ public Int64 HMaterID;// int //物料ID (Gy_Material)
+ public Int64 HUnitID;// int //计量单位 (Gy_Unit)
+ public double HQty;// dec(18,8) //数量
+ public double HPrice;// dec(18,8) //原币单价
+ public double HMoney;// dec(18,8) //原币金额
+ public Single HTaxRate;// money //税率
public double HTaxPrice; //含税单价
- public double HTaxMoney;// dec(18,8) --税额=原币金额*税率
- public double HlineTotal;// dec(18,8) --价税合计=原币金额+税额
- public double HlineTotalBB;// dec(18,8) --本位币价税合计=（原币金额+税额）*汇率 new
- public DateTime HDate;// datetime --交货日期
- public double HDiscountRate;// money --折扣率（可编辑） --addnew
- public double HRelTaxPrice;// dec(18,8) --实际含税单价（不可编辑） --addnew
- public double HInStockQty;// dec(18,8) --入库数量（不可编辑） --addnew
- public double HInvoiceQty;// dec(18,8) --开票数量（不可编辑） --addnew
- public string HSeOrderBillNo;// varchar(50) --销售订单号（不可编辑） --addnew
- public Int64 HSeOrderInterID;// int --销售订单主内码(隐藏) --addnew
- public Int64 HSeOrderEntryID;// int --销售订单子内码(隐藏) --addnew
+ public double HTaxMoney;// dec(18,8) //税额=原币金额*税率
+ public double HlineTotal;// dec(18,8) //价税合计=原币金额+税额
+ public double HlineTotalBB;// dec(18,8) //本位币价税合计=（原币金额+税额）*汇率 new
+ public DateTime HDate;// datetime //交货日期
+ public double HDiscountRate;// money //折扣率（可编辑） //addnew
+ public double HRelTaxPrice;// dec(18,8) //实际含税单价（不可编辑） //addnew
+ public double HInStockQty;// dec(18,8) //入库数量（不可编辑） //addnew
+ public double HInvoiceQty;// dec(18,8) //开票数量（不可编辑） //addnew
+ public string HSeOrderBillNo;// varchar(50) //销售订单号（不可编辑） //addnew
+ public Int64 HSeOrderInterID;// int //销售订单主内码(隐藏) //addnew
+ public Int64 HSeOrderEntryID;// int //销售订单子内码(隐藏) //addnew
public string HSourceInterID;
public string HSourceEntryID;
@@ -45,5 +45,38 @@
public Int64 HERPInterID;
public Int64 HERPEntryID;
+ public Int64 HSEQ;//行号
+ public Int64 HRECEIVEDEPTID;//收料部门
+ public string HSUPPLIERLOT;//供应商批号
+ public Int64 HBOMID;//BOM版本
+ public Int64 HSTOCKUNITID;//库存单位
+ public Int64 HBASEUNITID;//基本单位
+ public string HBFLOWID; //业务流程
+ public Int64 HGIVEAWAY; //是否赠品
+ public string HROWTYPE;//产品类型
+ public double HBASEUNITQTY;//基本单位数量
+ public double HSTOCKBASEQTY; //库存基本数量
+ public string HREQTRACENO;//需求跟踪号
+ public double HTAXNETPRICE; //含税净价
+ public double HPRICECOEFFICIENT;//价格系数
+ public Int64 HTAXCOMBINATION;//税组合
+ public Int64 HPRICEUNITID;//计价单位
+ public Int64 HPRICELISTENTRY;//分录价目表
+ public Int64 HPAYORGID;//付款组织
+ public Int64 HSETTLEMODEID;//结算方式
+ public Int64 HSETTLECURRID;//结算币别
+ public Int64 HEXCHANGETYPEID;//汇率类型
+ public Int64 HPAYCONDITIONID;//付款条件
+ public double HEXCHANGERATE;//汇率
+ public Int64 HLOCALCURRID;//本位币
+ public Int64 HISINCLUDEDTAX;//是否含税
+ public Int64 HISPRICEEXCLUDETAX;//价外税
+ public Int64 HTAXRATEID;//税率名称
+ public double HCOSTPERCENT;//计入成本比例%
+ public double HCOSTAMOUNT;//计入成本金额
+ public Int64 HVAT;//增值税
+ public Int64 HSELLERWITHHOLDING;//卖方代扣代缴
+ public Int64 HBUYERWITHHOLDING;//买方代扣代缴
+ public string HMATERIALDESC; //物料说明
}
}
diff --git a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
index dcc0ab2..cb62ce4 100644
--- a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
+++ b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
@@ -748,6 +748,15 @@
string HERPBillType = mainList2[0].HERPBillType == null ? "''" : mainList2[0].HERPBillType;
long HPURCHASEORGID = mainList2[0].HPURCHASEORGID == null ? 0 : mainList2[0].HPURCHASEORGID;
+ long HPURCHASERGROUPID = mainList2[0].HPURCHASERGROUPID == null ? 0 : mainList2[0].HPURCHASERGROUPID; //閲囪喘缁�
+ long HPROVIDERID = mainList2[0].HPROVIDERID == null ? 0 : mainList2[0].HPROVIDERID; //渚涜揣鏂�
+ long HSETTLEID = mainList2[0].HSETTLEID == null ? 0 : mainList2[0].HSETTLEID;//缁撶畻鏂�
+ long HCHARGEID = mainList2[0].HCHARGEID == null ? 0 : mainList2[0].HCHARGEID;//鏀舵鏂�
+ string HBUSINESSTYPE = mainList2[0].HBUSINESSTYPE == null ? "''" : mainList2[0].HBUSINESSTYPE; //涓氬姟绫诲瀷
+ string HPROVIDERADDRESS = mainList2[0].HPROVIDERADDRESS == null ? "''" : mainList2[0].HPROVIDERADDRESS; //渚涜揣鏂瑰湴鍧�
+ long HCORRESPONDORGID = mainList2[0].HCORRESPONDORGID == null ? 0 : mainList2[0].HCORRESPONDORGID; //瀵瑰簲缁勭粐
+ long HPROVIDERCONTACTID = mainList2[0].HPROVIDERCONTACTID == null ? 0 : mainList2[0].HPROVIDERCONTACTID;//渚涜揣鏂硅仈绯讳汉
+
ds = oCN.RunProcReturn("select * from h_v_IF_POOrderBillList where hmainid=" + HInterID + " and 鍗曟嵁鍙�='" + HBillNo + "'", "h_v_IF_POOrderBillList");
if ((OperationType == 1 || OperationType == 2) && ds.Tables[0].Rows.Count == 0)//鏂板
@@ -766,12 +775,15 @@
,HAddress,HSSID,HSSDate,HPSStyleID,HSupID,HCurID
,HExRate,HEmpID,HManagerID,HDeptID,HExplanation,HRemark,HInnerBillNo
,HChecker,HCheckDate,HMaker,HMakeDate
- ,HERPInterID,HERPBillType,HPURCHASEORGID)
+ ,HERPInterID,HERPBillType,HPURCHASEORGID
+ ,HPURCHASERGROUPID,HPROVIDERID,HSETTLEID,HCHARGEID,HBUSINESSTYPE,HPROVIDERADDRESS,HCORRESPONDORGID,HPROVIDERCONTACTID)
values(" + HInterID + "," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + 1102 + "','" +
HBillSubType + "','" + HDate + "','" + HBillNo + "','" + HBillStatus + "','" + HAddress +
"'," + HSSID + ",'" + HSSDate + "'," + HPSStyleID + "," + HSupID + "," + HCurID +
"," + HExRate + "," + HEmpID + "," + HManagerID + "," + HDeptID + ",'" + HExplanation + "','" + HRemark + "','" + HInnerBillNo + "','" + HChecker + "','" + HCheckDate + "','" + HMaker + "','" +
- HMakeDate + "'," + HERPInterID + ",'" + HERPBillType + "'," + HPURCHASEORGID + ")");
+ HMakeDate + "'," + HERPInterID + ",'" + HERPBillType + "'," + HPURCHASEORGID + "," + HPURCHASERGROUPID + ","
+ + HPROVIDERID + "," + HSETTLEID + "," + HCHARGEID + ",'" + HBUSINESSTYPE + "','" + HPROVIDERADDRESS + "',"
+ + HCORRESPONDORGID + "," + HPROVIDERCONTACTID + ")");
}
else if (OperationType == 3 || ds.Tables[0].Rows.Count != 0)
{ //淇敼
@@ -835,6 +847,40 @@
string HSourceInterID = DetailColl2[0].HSourceInterID == null ? "''" : DetailColl2[0].HSourceInterID;
string HSourceEntryID = DetailColl2[0].HSourceEntryID == null ? "''" : DetailColl2[0].HSourceEntryID;
+ long HSEQ = DetailColl2[0].HSEQ == null ? 0 : DetailColl2[0].HSEQ;//琛屽彿
+ long HRECEIVEDEPTID = DetailColl2[0].HRECEIVEDEPTID == null ? 0 : DetailColl2[0].HRECEIVEDEPTID;//鏀舵枡閮ㄩ棬
+ string HSUPPLIERLOT = DetailColl2[0].HSUPPLIERLOT == null ? "''" : DetailColl2[0].HSUPPLIERLOT;//渚涘簲鍟嗘壒鍙�
+ long HBOMID = DetailColl2[0].HBOMID == null ? 0 : DetailColl2[0].HBOMID;//BOM鐗堟湰
+ long HSTOCKUNITID = DetailColl2[0].HSTOCKUNITID == null ? 0 : DetailColl2[0].HSTOCKUNITID;//搴撳瓨鍗曚綅
+ long HBASEUNITID = DetailColl2[0].HBASEUNITID == null ? 0 : DetailColl2[0].HBASEUNITID;//鍩烘湰鍗曚綅
+ string HBFLOWID = DetailColl2[0].HBFLOWID == null ? "''" : DetailColl2[0].HBFLOWID; //涓氬姟娴佺▼
+ long HGIVEAWAY = DetailColl2[0].HGIVEAWAY == null ? 0 : DetailColl2[0].HGIVEAWAY; //鏄惁璧犲搧
+ string HROWTYPE = DetailColl2[0].HROWTYPE == null ? "''" : DetailColl2[0].HROWTYPE;//浜у搧绫诲瀷
+ double HBASEUNITQTY = DetailColl2[0].HBASEUNITQTY == null ? 0 : DetailColl2[0].HBASEUNITQTY;//鍩烘湰鍗曚綅鏁伴噺
+ double HSTOCKBASEQTY = DetailColl2[0].HSTOCKBASEQTY == null ? 0 : DetailColl2[0].HSTOCKBASEQTY; //搴撳瓨鍩烘湰鏁伴噺
+ string HREQTRACENO = DetailColl2[0].HREQTRACENO == null ? "''" : DetailColl2[0].HREQTRACENO;//闇�姹傝窡韪彿
+ double HTAXNETPRICE = DetailColl2[0].HTAXNETPRICE == null ? 0 : DetailColl2[0].HTAXNETPRICE; //鍚◣鍑�浠�
+ double HPRICECOEFFICIENT = DetailColl2[0].HPRICECOEFFICIENT == null ? 0 : DetailColl2[0].HPRICECOEFFICIENT;//浠锋牸绯绘暟
+ long HTAXCOMBINATION = DetailColl2[0].HTAXCOMBINATION == null ? 0 : DetailColl2[0].HTAXCOMBINATION;//绋庣粍鍚�
+ long HPRICEUNITID = DetailColl2[0].HPRICEUNITID == null ? 0 : DetailColl2[0].HPRICEUNITID;//璁′环鍗曚綅
+ long HPRICELISTENTRY = DetailColl2[0].HPRICELISTENTRY == null ? 0 : DetailColl2[0].HPRICELISTENTRY;//鍒嗗綍浠风洰琛�
+ long HPAYORGID = DetailColl2[0].HPAYORGID == null ? 0 : DetailColl2[0].HPAYORGID;//浠樻缁勭粐
+ long HSETTLEMODEID = DetailColl2[0].HSETTLEMODEID == null ? 0 : DetailColl2[0].HSETTLEMODEID;//缁撶畻鏂瑰紡
+ long HSETTLECURRID = DetailColl2[0].HSETTLECURRID == null ? 0 : DetailColl2[0].HSETTLECURRID;//缁撶畻甯佸埆
+ long HEXCHANGETYPEID = DetailColl2[0].HEXCHANGETYPEID == null ? 0 : DetailColl2[0].HEXCHANGETYPEID;//姹囩巼绫诲瀷
+ long HPAYCONDITIONID = DetailColl2[0].HPAYCONDITIONID == null ? 0 : DetailColl2[0].HPAYCONDITIONID;//浠樻鏉′欢
+ double HEXCHANGERATE = DetailColl2[0].HEXCHANGERATE == null ? 0 : DetailColl2[0].HEXCHANGERATE;//姹囩巼
+ long HLOCALCURRID = DetailColl2[0].HLOCALCURRID == null ? 0 : DetailColl2[0].HLOCALCURRID;//鏈綅甯�
+ long HISINCLUDEDTAX = DetailColl2[0].HISINCLUDEDTAX == null ? 0 : DetailColl2[0].HISINCLUDEDTAX;//鏄惁鍚◣
+ long HISPRICEEXCLUDETAX = DetailColl2[0].HISPRICEEXCLUDETAX == null ? 0 : DetailColl2[0].HISPRICEEXCLUDETAX;//浠峰绋�
+ long HTAXRATEID = DetailColl2[0].HTAXRATEID == null ? 0 : DetailColl2[0].HTAXRATEID;//绋庣巼鍚嶇О
+ double HCOSTPERCENT = DetailColl2[0].HCOSTPERCENT == null ? 0 : DetailColl2[0].HCOSTPERCENT;//璁″叆鎴愭湰姣斾緥%
+ double HCOSTAMOUNT = DetailColl2[0].HCOSTAMOUNT == null ? 0 : DetailColl2[0].HCOSTAMOUNT;//璁″叆鎴愭湰閲戦
+ long HVAT = DetailColl2[0].HVAT == null ? 0 : DetailColl2[0].HVAT;//澧炲�肩◣
+ long HSELLERWITHHOLDING = DetailColl2[0].HSELLERWITHHOLDING == null ? 0 : DetailColl2[0].HSELLERWITHHOLDING;//鍗栨柟浠ｆ墸浠ｇ即
+ long HBUYERWITHHOLDING = DetailColl2[0].HBUYERWITHHOLDING == null ? 0 : DetailColl2[0].HBUYERWITHHOLDING;//涔版柟浠ｆ墸浠ｇ即
+ string HMATERIALDESC = DetailColl2[0].HMATERIALDESC == null ? "''" : DetailColl2[0].HMATERIALDESC; //鐗╂枡璇存槑
+
int i = 0;
foreach (ClsCg_POOrderBillSub oSub in DetailColl)
@@ -890,10 +936,14 @@
,HMoney,HTaxRate,HTaxMoney,HLineTotal,HlineTotalBB,HDate,HInStockQty,HInvoiceQty,HSeOrderBillNo,HSeOrderInterID
,HSeOrderEntryID,HRemark,HSourceInterID,HSourceEntryID,HSourceBillNo
,HSourceBillType,HRelationQty,HBackRelationQty,HPropertyID,HBatChNo,HAuxPropID,HMTONo
- ,HERPInterID,HERPEntryID)
+ ,HERPInterID,HERPEntryID
+ ,HSEQ,HRECEIVEDEPTID,HSUPPLIERLOT,HBOMID,HSTOCKUNITID,HBASEUNITID,HBFLOWID,HGIVEAWAY,HROWTYPE,HBASEUNITQTY,HSTOCKBASEQTY
+ ,HREQTRACENO,HTAXNETPRICE,HPRICECOEFFICIENT,HTAXCOMBINATION,HPRICEUNITID,HPRICELISTENTRY,HPAYORGID,HSETTLEMODEID,HSETTLECURRID
+ ,HEXCHANGETYPEID,HPAYCONDITIONID,HEXCHANGERATE,HLOCALCURRID,HISINCLUDEDTAX,HISPRICEEXCLUDETAX,HTAXRATEID,HCOSTPERCENT,HCOSTAMOUNT
+ ,HVAT,HSELLERWITHHOLDING,HBUYERWITHHOLDING,HMATERIALDESC)
values({HInterID},{NewHEntryID},{oSub.HMaterID},{oSub.HUnitID},{(oSub.HQty == null ? 0 : oSub.HQty)}
,{oSub.HPrice},{oSub.HTaxPrice},{oSub.HDiscountRate},{oSub.HRelTaxPrice},{oSub.HMoney},{oSub.HTaxRate},{oSub.HTaxMoney},{oSub.HlineTotal},{oSub.HlineTotalBB},'{oSub.HDate}',{oSub.HInStockQty},{oSub.HInvoiceQty},{HSeOrderBillNo},{oSub.HSeOrderInterID},{oSub.HSeOrderEntryID},'{HRemark}',{HSourceInterID},{HSourceEntryID},{HSourceBillNo},{HSourceBillType},{HRelationQty},{HBackRelationQty},{HPropertyID},{HBatChNo},
- {HAuxPropID},{HMTONo},{HERPInterID},{HERPEntryID})");
+ {HAuxPropID},{HMTONo},{HERPInterID},{HERPEntryID},{HSEQ},{HRECEIVEDEPTID},'{HSUPPLIERLOT}',{HBOMID},{HSTOCKUNITID},{HBASEUNITID},'{HBFLOWID}',{HGIVEAWAY},{HROWTYPE},{HBASEUNITQTY},{HSTOCKBASEQTY},'{HREQTRACENO}',{HTAXNETPRICE},{HPRICECOEFFICIENT},{HTAXCOMBINATION},{HPRICEUNITID},{HPRICELISTENTRY},{HPAYORGID},{HSETTLEMODEID},{HSETTLECURRID},{HEXCHANGETYPEID},{HPAYCONDITIONID},{HEXCHANGERATE},{HLOCALCURRID},{HISINCLUDEDTAX},{HISPRICEEXCLUDETAX},{HTAXRATEID},{HCOSTPERCENT},{HCOSTAMOUNT},{HVAT},{HSELLERWITHHOLDING},{HBUYERWITHHOLDING},'{HMATERIALDESC}')");
}
objJsonResult.code = "1";
diff --git a/WebAPI/Controllers/SCGL/Sc_PPBomBillController.cs b/WebAPI/Controllers/SCGL/Sc_PPBomBillController.cs
index cddfdaf..fc30b37 100644
--- a/WebAPI/Controllers/SCGL/Sc_PPBomBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_PPBomBillController.cs
@@ -357,12 +357,12 @@
(HInterID,HYear,HPeriod,HBillType,HBillSubType,HDate,HBillNo,HBillStatus,HICMOInterID
,HICMOEntryID,HMaterID,HUnitID,HQty,HDeptID,HMaker,HMakeDate,HChecker,HCheckDate
,HSeOrderBillNo,HSeOrderInterID,HSeOrderEntryID,HPRDORGID,HENTRUSTORGID,HPARENTOWNERID
- ,HPARENTOWNERTYPEID,HERPInterID,HERPBillType,HSeOrderEntrySEQ,HICMOEntrySEQ)
+ ,HPARENTOWNERTYPEID,HERPInterID,HERPBillType,HSeOrderEntrySEQ,HICMOEntrySEQ,HREQSRC)
values(" + HInterID + "," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + 3720 + "','" +
HBillSubType + "','" + HDate + "','" + HBillNo + "','" + HBillStatus + "'," + HICMOInterID +
"," + HICMOEntryID + ",'" + HMaterID + "'," + HUnitID + "," + HQty + "," + HDeptID +
",'" + HMaker + "','" + HMakeDate + "','" + HChecker + "','" + HCheckDate + "','" + HSeOrderBillNo + "'," + HSeOrderInterID + "," + HSeOrderEntryID + "," + HPRDORGID + "," + HENTRUSTORGID + "," + HPARENTOWNERID + "," +
- HPARENTOWNERTYPEID + "," + HERPInterID + ",'" + HERPBillType + "'," + HSeOrderEntrySEQ + "," + HICMOEntrySEQ + ")");
+ HPARENTOWNERTYPEID + "," + HERPInterID + ",'" + HERPBillType + "'," + HSeOrderEntrySEQ + "," + HICMOEntrySEQ + ",'" + HREQSRC + "')");
}
else if (OperationType == 3 || ds.Tables[0].Rows.Count != 0)
{ //淇敼
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs" "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs"
index 76faf2a..42b7352 100644
--- "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs"
+++ "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs"
@@ -98,6 +98,9 @@
double? HPlanQty = mainList[0].HPlanQty == null ? 0 : mainList[0].HPlanQty;//璁″垝鏁伴噺
string HMaker = user;//鍒跺崟浜�
+ long HISENTRUST = mainList[0].HISENTRUST == null ? 0 : mainList[0].HISENTRUST;//缁勭粐鍙楁墭鍔犲伐
+ long HISREWORK = mainList[0].HISREWORK == null ? 0 : mainList[0].HISREWORK;//鏄惁杩斿伐
+
ds = oCN.RunProcReturn("select * from h_v_IF_ICMOBillList where hmainid=" + HInterID + " and 鍗曟嵁鍙�='" + HBillNo + "'", "h_v_IF_ICMOBillList");
if ((OperationType == 1 || OperationType == 2) && ds.Tables[0].Rows.Count == 0)//鏂板
@@ -107,11 +110,11 @@
(HBillType,HInterID,HBillNo,HDate,HPRDORGID
,HYear,HPeriod,HRemark,HMaker,HMakeDate
,HSeOrderBillNo,HSeOrderInterID,HSeOrderEntryID,HEmpID,HCusID
- ,HCenterID,HPlanQty,HDeptID,HMaterID,HUnitID,HBomID,HPlanBeginDate,HPlanEndDate)
+ ,HCenterID,HPlanQty,HDeptID,HMaterID,HUnitID,HBomID,HPlanBeginDate,HPlanEndDate,HISENTRUST,HISREWORK)
values('3710'," + HInterID + ",'" + HBillNo + "','" + HDate + "'," + HPRDORGID +
"," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + HRemark + "','" + HMaker + "',getdate()" +
",'" + HSeOrderBillNo + "'," + HSeOrderInterID + "," + HSeOrderEntryID + "," + HEmpID + "," + HCusID +
- "," + HCenterID + "," + HPlanQty + ",0,0,0,0,'','') ");
+ "," + HCenterID + "," + HPlanQty + ",0,0,0,0,'',''" + "," + HISENTRUST + "," + HISREWORK + ") ");
}
else if (OperationType == 3 || ds.Tables[0].Rows.Count != 0)
{ //淇敼
@@ -154,6 +157,19 @@
public json AddBillSub(string msg3, long HInterID, int OperationType)
{
List<ClsSc_ICMOBillSub> DetailColl = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsSc_ICMOBillSub>>(msg3);
+
+ string HINSTOCKTYPE = DetailColl[0].HINSTOCKTYPE == null ? "''" : DetailColl[0].HINSTOCKTYPE; //鍏ュ簱绫诲瀷,
+ long HCHECKPRODUCT = DetailColl[0].HCHECKPRODUCT == null ? 0 : DetailColl[0].HCHECKPRODUCT; //浜у搧妫�楠�,
+ string HQAIP = DetailColl[0].HQAIP == null ? "''" : DetailColl[0].HQAIP; //绱ф�ユ斁琛�,
+ long HISBACKFLUSH = DetailColl[0].HISBACKFLUSH == null ? 0 : DetailColl[0].HISBACKFLUSH; //鍊掑啿棰嗘枡,
+ string HREQSRC = DetailColl[0].HREQSRC == null ? "''" : DetailColl[0].HREQSRC; //闇�姹傛潵婧�,
+ double HSTOCKINQUASELAUXQTY = DetailColl[0].HSTOCKINQUASELAUXQTY == null ? 0 : DetailColl[0].HSTOCKINQUASELAUXQTY; //鍚堟牸鍝佸叆搴撻�夊崟鏁伴噺,
+ long HSeOrderEntrySEQ = DetailColl[0].HSeOrderEntrySEQ == null ? 0 : DetailColl[0].HSeOrderEntrySEQ; //閿�鍞鍗曡鍙�,
+ string HPROJECTNO = DetailColl[0].HPROJECTNO == null ? "''" : DetailColl[0].HPROJECTNO; //椤圭洰缂栧彿,
+ long HPRODUCTTYPE = DetailColl[0].HPRODUCTTYPE == null ? 0 : DetailColl[0].HPRODUCTTYPE; //浜у搧绫诲瀷,
+ long HCOSTRATE = DetailColl[0].HCOSTRATE == null ? 0 : DetailColl[0].HCOSTRATE; // 鏉冮噸,
+ long HBASEUNITID = DetailColl[0].HBASEUNITID == null ? 0 : DetailColl[0].HBASEUNITID; //鍩烘湰璁￠噺鍗曚綅,
+
int i = 0;
foreach (ClsSc_ICMOBillSub oSub in DetailColl)
{
@@ -208,12 +224,13 @@
,HPlanBeginDate,HPlanEndDate
,HBeginDate,HEndDate
,HMaterID,HUnitID,HRemark,HSourceID,HDeptID,HSTATUS
- ,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney)
+ ,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney
+ ,HINSTOCKTYPE,HCHECKPRODUCT,HQAIP,HISBACKFLUSH,HREQSRC,HSTOCKINQUASELAUXQTY,HSeOrderEntrySEQ,HPROJECTNO,HPRODUCTTYPE,HCOSTRATE,HBASEUNITID)
values({HInterID},{i},{(oSub.HQty == null ? 0 : oSub.HQty)}
,'{(oSub.HPlanBeginDate == null ? DateTime.Now.ToString("yyyy-MM-dd") : oSub.HPlanBeginDate.ToString())}','{(oSub.HPlanEndDate == null ? DateTime.Now.AddDays(1).ToString("yyyy-MM-dd") : oSub.HPlanEndDate.ToString())}'
,'{(oSub.HPlanBeginDate == null ? DateTime.Now.ToString("yyyy-MM-dd") : oSub.HPlanBeginDate.ToString())}','{(oSub.HPlanEndDate == null ? DateTime.Now.AddDays(1).ToString("yyyy-MM-dd") : oSub.HPlanEndDate.ToString())}'
,{oSub.HMaterID},{oSub.HUnitID},'{oSub.HRemark}',{oSub.HSourceID},{oSub.HDeptID},{oSub.HSTATUS}
- ,0,0,'','',0,0)");
+ ,0,0,'','',0,0,{HINSTOCKTYPE},{HCHECKPRODUCT},{HQAIP},{HISBACKFLUSH},{HREQSRC},{HSTOCKINQUASELAUXQTY},{HSeOrderEntrySEQ},{HPROJECTNO},{HPRODUCTTYPE},{HCOSTRATE},{HBASEUNITID})");
}
objJsonResult.code = "1";
diff --git a/WebAPI/DLL/ClsGy_Material_Ctl.cs b/WebAPI/DLL/ClsGy_Material_Ctl.cs
index 088733c..632d44c 100644
--- a/WebAPI/DLL/ClsGy_Material_Ctl.cs
+++ b/WebAPI/DLL/ClsGy_Material_Ctl.cs
@@ -24,14 +24,16 @@
",HWhID,HRoutingID,HBomID,HSecUnitID,HSecUnitRate" +
",HHighStock,HLowStock,HSafeStock,HOrderPrice,HSalePrice" +
",HKeepDays,HPlanPrice,HstdPrice,HQtyMin,HQtyMax" +
- ",HSubjoin,HSubjoin2,HColor,HVersion,HEngName,HEngModel,HPropertyTypeID,HSPGroupID,HSPID,HMinPickQty,HUSEORGID,HERPItemID) " +
+ ",HSubjoin,HSubjoin2,HColor,HVersion,HEngName,HEngModel,HPropertyTypeID,HSPGroupID,HSPID,HMinPickQty,HUSEORGID,HERPItemID" +
+ ",HSALEUNITID,HSALEPRICEUNITID,HBASEUNITID,HSTOREUNITID,HCHECKINCOMING,HCHECKPRODUCT,HPERUNITSTANDHOUR" +
+ ",HSTDLABORPREPARETIME,HSTDMACHINEPREPARETIME) " +
" Values('" + oModel.HNumber + "','" + oModel.HName + "','" + oModel.HHelpCode + "','" + oModel.HShortNumber + "'," + oModel.HParentID.ToString() +
", " + oModel.HLevel.ToString() + "," + Convert.ToString(oModel.HEndFlag ? 1 : 0) + "," + Convert.ToString(oModel.HStopflag ? 1 : 0) + ",'" + oModel.HRemark + "'" +
",'" + oModel.HModel + "'," + oModel.HUnitID.ToString() + "," + oModel.HMaterClsID.ToString() + "," + oModel.HMaterTypeID.ToString() + "," + oModel.HUnitGroupID.ToString() +
", " + oModel.HWhID.ToString() + "," + oModel.HRoutingID.ToString() + "," + oModel.HBomID.ToString() + "," + oModel.HSecUnitID.ToString() + "," + oModel.HSecUnitRate.ToString() +
", " + oModel.HHighStock.ToString() + "," + oModel.HLowStock.ToString() + "," + oModel.HSafeStock.ToString() + "," + oModel.HOrderPrice.ToString() + ",'" + oModel.HSalePrice + "'" +
", " + oModel.HKeepDays.ToString() + "," + oModel.HPlanPrice.ToString() + "," + oModel.HstdPrice.ToString() + "," + oModel.HQtyMin.ToString() + "," + oModel.HQtyMax.ToString() +
- ",'" + oModel.HSubjoin + "','" + oModel.HSubjoin2 + "','" + oModel.HColor + "','" + oModel.HVersion + "','" + oModel.HEngName + "','" + oModel.HEngModel + "'," + oModel.HPropertyTypeID.ToString() + "," + oModel.HSPGroupID.ToString() + "," + oModel.HSPID.ToString() + "," + oModel.HMinPickQty.ToString() + "," + oModel.HUSEORGID + "," + oModel.HERPItemID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
+ ",'" + oModel.HSubjoin + "','" + oModel.HSubjoin2 + "','" + oModel.HColor + "','" + oModel.HVersion + "','" + oModel.HEngName + "','" + oModel.HEngModel + "'," + oModel.HPropertyTypeID.ToString() + "," + oModel.HSPGroupID.ToString() + "," + oModel.HSPID.ToString() + "," + oModel.HMinPickQty.ToString() + "," + oModel.HUSEORGID + "," + oModel.HERPItemID + "," + oModel.HSALEUNITID + "," + oModel.HSALEPRICEUNITID + "," + oModel.HBASEUNITID + "," + oModel.HSTOREUNITID + "," + oModel.HCHECKINCOMING + "," + oModel.HCHECKPRODUCT + "," + oModel.HPERUNITSTANDHOUR + "," + oModel.HSTDLABORPREPARETIME + "," + oModel.HSTDMACHINEPREPARETIME + ")", ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
oCn.Commit();
@@ -126,7 +128,16 @@
",HSPGroupID=" + oModel.HSPGroupID.ToString() +
",HSPID=" + oModel.HSPID.ToString() +
",HMinPickQty=" + oModel.HMinPickQty.ToString() +
- ",HPropertyTypeID=" + oModel.HPropertyTypeID.ToString() + "Where HItemID=" + sItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+ ",HPropertyTypeID=" + oModel.HPropertyTypeID.ToString() +
+ ",HSALEUNITID=" + oModel.HSALEUNITID.ToString() +
+ ",HSALEPRICEUNITID=" + oModel.HSALEPRICEUNITID.ToString() +
+ ",HBASEUNITID=" + oModel.HBASEUNITID.ToString() +
+ ",HSTOREUNITID=" + oModel.HSTOREUNITID.ToString() +
+ ",HCHECKINCOMING=" + oModel.HCHECKINCOMING.ToString() +
+ ",HCHECKPRODUCT=" + oModel.HCHECKPRODUCT.ToString() +
+ ",HPERUNITSTANDHOUR=" + oModel.HPERUNITSTANDHOUR.ToString() +
+ ",HSTDLABORPREPARETIME=" + oModel.HSTDLABORPREPARETIME.ToString() +
+ ",HSTDMACHINEPREPARETIME=" + oModel.HSTDMACHINEPREPARETIME.ToString() + "Where HItemID=" + sItemID, ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼瀛愰」鐩唬鐮�
oCn.RunProc("exec h_p_Gy_UpdateNumber '" + MvarItemKey + "','" + oModel.HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
//灏嗕笂绾� 涓洪潪鏈骇
diff --git a/WebAPI/DLL/ClsSc_ICMOReportBill.cs b/WebAPI/DLL/ClsSc_ICMOReportBill.cs
index 937b973..476118b 100644
--- a/WebAPI/DLL/ClsSc_ICMOReportBill.cs
+++ b/WebAPI/DLL/ClsSc_ICMOReportBill.cs
@@ -156,11 +156,15 @@
",HYear,HPeriod,HRemark,HEmpID,HEmpNumber" +
",HGroupID,HDeptID,HDeptNumber" +
",HMainSourceBillNo,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillType" +
+ ",HChecker,HCheckDate,HUpDater,HUpDateDate,HDeleteMan,HDeleteDate,HPrintQty,HCheckType" +
+ ",HERPInterID,HERPBillType,HPRDORGID" +
") " +
" values('" + this.BillType + "','" + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "','" + omodel.HMaker+ "',getdate()" +
"," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HEmpID.ToString() + "','" + omodel.HEmpNumber +
"','" + omodel.HGroupID.ToString() + "'," + omodel.HDeptID.ToString() + ",'" + omodel.HDeptNumber +
- "','" + omodel.HMainSourceBillNo.ToString() + "'," + omodel.HMainSourceInterID.ToString() + ",'" + omodel.HMainSourceEntryID + "','" + omodel.HMainSourceBillType + "'" +
+ "','" + omodel.HMainSourceBillNo.ToString() + "'," + omodel.HMainSourceInterID.ToString() + ",'" + omodel.HMainSourceEntryID + "','" + omodel.HMainSourceBillType + "','" + omodel.HChecker + "','" + omodel.HCheckDate + "','" + omodel.HUpDater +
+ "','" + omodel.HUpDateDate + "','" + omodel.HDeleteMan + "','" + omodel.HDeleteDate + "'," + omodel.HPrintQty +
+ ",'" + omodel.HCheckType + "'," + omodel.HERPInterID + ",'" + omodel.HERPBillType + "'," + omodel.HPRDORGID +
") ");
//鎻掑叆瀛愯〃
foreach (Models.ClsSc_ICMOReportBillSub oSub in DetailColl)
@@ -173,14 +177,23 @@
"HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
",HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo" +
",HICMOInterID,HICMOBillNo,HBarCode" +
+ ",HOWNERTYPEID,HISENTRUST,HSTOCKINORGID,HOWNERID,HCHECKPRODUCT,HQAIP,HCOSTRATE,HISBACKFLUSH" +
+ ",HREQSRC,HREQBILLNO,HREQBILLID,HREQENTRYSEQ,HREQENTRYID,HMOMAINENTRYID,HSTOCKINQUASELQTY" +
+ ",HPRODUCTTYPE,HPROJECTNO,HICMOENTRYSEQ,HSEQ,HPRODUCEDATE,HEXPIRYDATE,HBASEUNITID,HDEPTID" +
+ ",HGroupID,HDESCRIPTION" +
+ ",HSourceNumber,HQPQty,HICMOEntryID" +
+ ",HWhID,HSPID,HBatChNo,HAuxPropID,HMTONo,HPlanMode,HERPInterID,HERPEntryID" +
") values("
+ omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + "," + oSub.HMaterID.ToString() + ",'" + oSub.HMaterNumber + "'" +
"," + oSub.HQty.ToString() + "," + oSub.HUnitID.ToString() + ",'" + oSub.HUnitNumber + "'," + oSub.HTimes.ToString() + "," + oSub.HSourceID.ToString() +
"," + oSub.HQtyMust.ToString() + "," + oSub.HWorkerID.ToString() + ",'" + oSub.HWorkerNumber + "'," + oSub.HBadCount.ToString() + "," + oSub.HWasterQty.ToString() +
",'" + oSub.HCloseMan + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
- "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+ "," + oSub.HSourceInterID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
"," + oSub.HSeOrderInterID.ToString() + "," + oSub.HSeOrderEntryID.ToString() + ",'" + oSub.HSeOrderBillNo + "'" +
- "," + oSub.HICMOInterID.ToString() + ",'" + oSub.HICMOBillNo + "','" + oSub.HBarCode + "'" +
+ "," + oSub.HICMOInterID.ToString() + ",'" + oSub.HICMOBillNo + "','" + oSub.HBarCode + "','" + oSub.HOWNERTYPEID + "'," +
+ oSub.HISENTRUST + "," + oSub.HSTOCKINORGID + "," + oSub.HOWNERID + "," + oSub.HCHECKPRODUCT + ",'" + oSub.HQAIP + "'," +
+ oSub.HCOSTRATE + "," + oSub.HISBACKFLUSH + ",'" + oSub.HREQSRC + "','" + oSub.HREQBILLNO + "'," + oSub.HREQBILLID + "," +
+ oSub.HREQENTRYSEQ + "," + oSub.HREQENTRYID + "," + oSub.HMOMAINENTRYID + "," + oSub.HSTOCKINQUASELQTY + "," + oSub.HPRODUCTTYPE + ",'" + oSub.HPROJECTNO + "'," + oSub.HICMOENTRYSEQ + "," + oSub.HSEQ + ",'" + oSub.HPRODUCEDATE + "','" + oSub.HEXPIRYDATE + "'," + oSub.HBASEUNITID + "," + oSub.HDEPTID + "," + oSub.HGroupID + ",'" + oSub.HDESCRIPTION + "','" + oSub.HSourceNumber + "'," + oSub.HQPQty + "," + oSub.HSourceEntryID + "," + oSub.HICMOEntryID + "," + oSub.HWhID + "," + oSub.HSPID + ",'" + oSub.HBatChNo + "'," + oSub.HAuxPropID + ",'" + oSub.HMTONo + "'," + oSub.HPlanMode + "," + oSub.HERPInterID + "," + oSub.HERPEntryID +
") ");
}
//
diff --git a/WebAPI/Models/ClsGy_Material_Model.cs b/WebAPI/Models/ClsGy_Material_Model.cs
index 0a5a831..01beea3 100644
--- a/WebAPI/Models/ClsGy_Material_Model.cs
+++ b/WebAPI/Models/ClsGy_Material_Model.cs
@@ -42,5 +42,15 @@
public int HUSEORGID;
public int HERPItemID;
public int HCREATEORGID;
+
+ public int HSALEUNITID; //閿�鍞閲忓崟浣�(gy_unit)
+ public int HSALEPRICEUNITID; //閿�鍞浠疯閲忓崟浣�(gy_unit)
+ public int HBASEUNITID; //鍩烘湰璁￠噺鍗曚綅(gy_unit)
+ public int HSTOREUNITID; //搴撳瓨璁￠噺鍗曚綅(gy_unit)
+ public int HCHECKINCOMING; //鏄惁鏉ユ枡妫�楠�
+ public int HCHECKPRODUCT; //鏄惁浜у搧妫�楠�
+ public double HPERUNITSTANDHOUR; //鏍囧噯宸ユ椂
+ public double HSTDLABORPREPARETIME; //鏍囧噯浜哄憳鍑嗗宸ユ椂
+ public double HSTDMACHINEPREPARETIME; //鏍囧噯鏈哄櫒鍑嗗宸ユ椂
}
}
\ No newline at end of file
diff --git a/WebAPI/Models/ClsSc_ICMOReportBillMain.cs b/WebAPI/Models/ClsSc_ICMOReportBillMain.cs
index f1740fe..6270dcc 100644
--- a/WebAPI/Models/ClsSc_ICMOReportBillMain.cs
+++ b/WebAPI/Models/ClsSc_ICMOReportBillMain.cs
@@ -14,5 +14,9 @@
public string HCheckType;
public Int64 HPrintQty;
public string HWorkShift;
+
+ public Int64 HERPInterID;
+ public string HERPBillType;
+
}
}
diff --git a/WebAPI/Models/ClsSc_ICMOReportBillSub.cs b/WebAPI/Models/ClsSc_ICMOReportBillSub.cs
index c9c468c..f7b45e3 100644
--- a/WebAPI/Models/ClsSc_ICMOReportBillSub.cs
+++ b/WebAPI/Models/ClsSc_ICMOReportBillSub.cs
@@ -4,7 +4,7 @@
namespace WebAPI.Models
{
- public class ClsSc_ICMOReportBillSub:DBUtility.ClsXt_BaseBillSub
+ public class ClsSc_ICMOReportBillSub : DBUtility.ClsXt_BaseBillSub
{
public Int64 HMaterID;
public string HMaterNumber;
@@ -31,5 +31,49 @@
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 Int64 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;
}
}
--
Gitblit v1.9.1