订单接口，材料出库单接口

jeecg-boot-module-system/src/main/java/org/jeecg/modules/openApi/controller/MOMainController.java

@@ -101,10 +101,10 @@ public class MOMainController implements ApplicationContextAware {
                             "'' as 'customerContactsPhone','0.00' as 'totalAmount','0.00' as 'exTaxAmount', curr.cexch_code as 'currencyCode'," +
                             "mo.iTaxRate as 'headerTaxRate',mo.dDate as 'customerDemandDate', mo.cMemo as 'remark',mo.dVerifyDate as dVerifyDate," +
                             "'' as 'sourceDocNum',mo.cMaker as 'customerContacts',mo.dCreateTime  as 'publishDate',0 as 'tenantId'," +
-                            "mo.cDefine5 as headerAttributeBigint2,mo.cDefine11 as headerAttributeString1,mo.cDefine12 as headerAttributeString3," +
+                            "mo.cDefine5 as headerAttributeBigint2,ex.chdefine2 as headerAttributeString1,mo.cDefine12 as headerAttributeString3," +
                             "mo.cDefine13 as headerAttributeString4,mo.cDefine14 as headerAttributeString5,mo.cVenBank as headerAttributeString7," +
                             "mo.cVenAccount as headerAttributeString8,hr.cDept_num as 'headerAttributeString11',mo.cCurrentAuditor as headerAttributeString12," +
-                            "0 as 'totalAmount','' as 'headerAttributeString1', mo.cCode as 'headerAttributeString2','' as 'headerAttributeString3'," +
+                            "0 as 'totalAmount',mo.cCode as 'headerAttributeString2','' as 'headerAttributeString3'," +
                             "'' as 'headerAttributeString4'  from OM_MOMain mo left join Vendor ven on mo.cVenCode = ven.cVenCode " +
                             " left join (select cPsn_Num, cPsn_Name,cDept_num from hr_hi_person) hr " +
                             " on mo.cMaker = hr.cPsn_Name " +
@@ -112,6 +112,7 @@ public class MOMainController implements ApplicationContextAware {
                             " on mo.cPersonCode = hr1.cPsn_Num " +
                             " left join foreigncurrency curr " +
                             " on mo.cexch_name = curr.cexch_name " +
+                            " left join OM_MOmain_extradefine ex on mo.MOID = ex.MOID"+
                             " where  mo.iVerifyStateNew = 2 and ((mo.dVerifyTime>'"+lasttimeSf+"' or mo.dChangeVerifyTime >'"+lasttimeSf+"' and cDefine16 is null) or (mo.dVerifyTime>'"+lasttimeSf+"' or mo.dChangeVerifyTime >'"+lasttimeSf+"' and cDefine16 =1))  order by mo.dCreateTime desc";
 
                     List<Map<String, Object>> list = senYuDataSourceOne.queryForList(sql);
@@ -126,10 +127,10 @@ public class MOMainController implements ApplicationContextAware {
                             "'' as 'customerContactsPhone','0.00' as 'totalAmount','0.00' as 'exTaxAmount', curr.cexch_code as 'currencyCode'," +
                             "mo.iTaxRate as 'headerTaxRate',mo.dDate as 'customerDemandDate', mo.cMemo as 'remark',mo.dVerifyDate as dVerifyDate," +
                             "'' as 'sourceDocNum',mo.cMaker as 'customerContacts',mo.dCreateTime  as 'publishDate',0 as 'tenantId'," +
-                            "mo.cDefine5 as headerAttributeBigint2,mo.cDefine11 as headerAttributeString1,mo.cDefine12 as headerAttributeString3," +
+                            "mo.cDefine5 as headerAttributeBigint2,ex.chdefine2 as headerAttributeString1,mo.cDefine12 as headerAttributeString3," +
                             "mo.cDefine13 as headerAttributeString4,mo.cDefine14 as headerAttributeString5,mo.cVenBank as headerAttributeString7," +
                             "mo.cVenAccount as headerAttributeString8,hr.cDept_num as 'headerAttributeString11',mo.cCurrentAuditor as headerAttributeString12," +
-                            "0 as 'totalAmount','' as 'headerAttributeString1', mo.cCode as 'headerAttributeString2','' as 'headerAttributeString3'," +
+                            "0 as 'totalAmount',mo.cCode as 'headerAttributeString2','' as 'headerAttributeString3'," +
                             "'' as 'headerAttributeString4'  from OM_MOMain mo left join Vendor ven on mo.cVenCode = ven.cVenCode " +
                             " left join (select cPsn_Num, cPsn_Name,cDept_num from hr_hi_person) hr " +
                             " on mo.cMaker = hr.cPsn_Name " +
@@ -137,6 +138,7 @@ public class MOMainController implements ApplicationContextAware {
                             " on mo.cPersonCode = hr1.cPsn_Num " +
                             " left join foreigncurrency curr " +
                             " on mo.cexch_name = curr.cexch_name " +
+                            " left join OM_MOmain_extradefine ex on mo.MOID = ex.MOID"+
                             " where  mo.iVerifyStateNew = 2 and ((mo.dVerifyTime>'"+lasttimeSf+"' or mo.dChangeVerifyTime >'"+lasttimeSf+"' and cDefine16 is null) or (mo.dVerifyTime>'"+lasttimeSf+"' or mo.dChangeVerifyTime >'"+lasttimeSf+"' and cDefine16 =1))   order by mo.dCreateTime desc";
 
                     List<Map<String, Object>> list = senYuDataSourceTwo.queryForList(sql);
@@ -151,10 +153,10 @@ public class MOMainController implements ApplicationContextAware {
                             "'' as 'customerContactsPhone','0.00' as 'totalAmount','0.00' as 'exTaxAmount', curr.cexch_code as 'currencyCode'," +
                             "mo.iTaxRate as 'headerTaxRate',mo.dDate as 'customerDemandDate', mo.cMemo as 'remark',mo.dVerifyDate as dVerifyDate," +
                             "'' as 'sourceDocNum',mo.cMaker as 'customerContacts',mo.dCreateTime  as 'publishDate',0 as 'tenantId'," +
-                            "mo.cDefine5 as headerAttributeBigint2,mo.cDefine11 as headerAttributeString1,mo.cDefine12 as headerAttributeString3," +
+                            "mo.cDefine5 as headerAttributeBigint2,ex.chdefine2 as headerAttributeString1,mo.cDefine12 as headerAttributeString3," +
                             "mo.cDefine13 as headerAttributeString4,mo.cDefine14 as headerAttributeString5,mo.cVenBank as headerAttributeString7," +
                             "mo.cVenAccount as headerAttributeString8,hr.cDept_num as 'headerAttributeString11',mo.cCurrentAuditor as headerAttributeString12," +
-                            "0 as 'totalAmount','' as 'headerAttributeString1', mo.cCode as 'headerAttributeString2','' as 'headerAttributeString3'," +
+                            "0 as 'totalAmount',mo.cCode as 'headerAttributeString2','' as 'headerAttributeString3'," +
                             "'' as 'headerAttributeString4'  from OM_MOMain mo left join Vendor ven on mo.cVenCode = ven.cVenCode " +
                             " left join (select cPsn_Num, cPsn_Name,cDept_num from hr_hi_person) hr " +
                             " on mo.cMaker = hr.cPsn_Name " +
@@ -162,6 +164,7 @@ public class MOMainController implements ApplicationContextAware {
                             " on mo.cPersonCode = hr1.cPsn_Num " +
                             " left join foreigncurrency curr " +
                             " on mo.cexch_name = curr.cexch_name " +
+                            " left join OM_MOmain_extradefine ex on mo.MOID = ex.MOID"+
                             " where  mo.iVerifyStateNew = 2 and ((mo.dVerifyTime>'"+lasttimeSf+"' or mo.dChangeVerifyTime >'"+lasttimeSf+"' and cDefine16 is null) or (mo.dVerifyTime>'"+lasttimeSf+"' or mo.dChangeVerifyTime >'"+lasttimeSf+"' and cDefine16 =1))  order by mo.dCreateTime desc";
 
                     List<Map<String, Object>> list = iSenYuDataSourceThree.queryForList(sql);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/openApi/controller/POPomainController.java

@@ -94,7 +94,7 @@ public class POPomainController implements ApplicationContextAware {
                             "mo.cPOID as headerAttributeString2,'' as 'customerContactsPhone','0.00' as 'totalAmount'," +
                             "'0.00' as 'exTaxAmount', curr.cexch_code as 'currencyCode',mo.iTaxRate as 'headerTaxRate'," +
                             "mo.dPODate as 'customerDemandDate', mo.cMemo as 'remark','' as 'sourceDocNum'," +
-                            "mo.cDefine5 as headerAttributeBigint2,mo.cDefine11 as headerAttributeString1,mo.cDefine12 as headerAttributeString3," +
+                            "mo.cDefine5 as headerAttributeBigint2,ex.chdefine2 as headerAttributeString1,mo.cDefine12 as headerAttributeString3," +
                             "mo.cDefine13 as headerAttributeString4,mo.cDefine14 as headerAttributeString5,mo.cVenBank as headerAttributeString7," +
                             "mo.cVenAccount as headerAttributeString8,mo.cCurrentAuditor as headerAttributeString12," +
                             "mo.cMaker as 'customerContacts',hr1.cPsn_Name as headerAttributeString10,mo.cAuditDate as cAuditDate," +
@@ -105,7 +105,8 @@ public class POPomainController implements ApplicationContextAware {
                             "on mo.cPersonCode = hr1.cPsn_Num " +
                             "left join foreigncurrency curr " +
                             "on mo.cexch_name = curr.cexch_name " +
-                            "where ((cAuditTime>'"+lasttimeSf+"' or cChangAuditTime >'"+lasttimeSf+"' and cDefine16 is null) or(cAuditTime>'"+lasttimeSf+"' or cChangAuditTime >'"+lasttimeSf+"' and cDefine16 = 1)) and mo.iverifystateex = 2 order by mo.cAuditTime desc";
+                            "left join PO_POmain_extradefine ex on mo.POID = ex.POID " +
+                            " where ((cAuditTime>'"+lasttimeSf+"' or cChangAuditTime >'"+lasttimeSf+"' and cDefine16 is null) or(cAuditTime>'"+lasttimeSf+"' or cChangAuditTime >'"+lasttimeSf+"' and cDefine16 = 1)) and mo.iverifystateex = 2 order by mo.cAuditTime desc";
                     List<Map<String, Object>> list = senYuDataSourceOne.queryForList(sql);
                     for(Map<String, Object> map:list){
                         sumlist.add(map);
@@ -119,7 +120,7 @@ public class POPomainController implements ApplicationContextAware {
                             "mo.cPOID as headerAttributeString2,'' as 'customerContactsPhone','0.00' as 'totalAmount'," +
                             "'0.00' as 'exTaxAmount', curr.cexch_code as 'currencyCode',mo.iTaxRate as 'headerTaxRate'," +
                             "mo.dPODate as 'customerDemandDate', mo.cMemo as 'remark','' as 'sourceDocNum'," +
-                            "mo.cDefine5 as headerAttributeBigint2,mo.cDefine11 as headerAttributeString1,mo.cDefine12 as headerAttributeString3," +
+                            "mo.cDefine5 as headerAttributeBigint2,ex.chdefine2 as headerAttributeString1,mo.cDefine12 as headerAttributeString3," +
                             "mo.cDefine13 as headerAttributeString4,mo.cDefine14 as headerAttributeString5,mo.cVenBank as headerAttributeString7," +
                             "mo.cVenAccount as headerAttributeString8,mo.cCurrentAuditor as headerAttributeString12," +
                             "mo.cMaker as 'customerContacts',hr1.cPsn_Name as headerAttributeString10,mo.cAuditDate as cAuditDate," +
@@ -130,6 +131,7 @@ public class POPomainController implements ApplicationContextAware {
                             "on mo.cPersonCode = hr1.cPsn_Num " +
                             "left join foreigncurrency curr " +
                             "on mo.cexch_name = curr.cexch_name " +
+                            "left join PO_POmain_extradefine ex on mo.POID = ex.POID " +
                             "where ((cAuditTime>'"+lasttimeSf+"' or cChangAuditTime >'"+lasttimeSf+"'  and cDefine16 is null) or(cAuditTime>'"+lasttimeSf+"' or cChangAuditTime >'"+lasttimeSf+"' and cDefine16 = 1)) and mo.iverifystateex = 2  order by mo.cAuditTime desc";
                     List<Map<String, Object>> list = senYuDataSourceTwo.queryForList(sql);
                     for(Map<String, Object> map:list){
@@ -143,7 +145,7 @@ public class POPomainController implements ApplicationContextAware {
                             "mo.cPOID as headerAttributeString2,'' as 'customerContactsPhone','0.00' as 'totalAmount'," +
                             "'0.00' as 'exTaxAmount', curr.cexch_code as 'currencyCode',mo.iTaxRate as 'headerTaxRate'," +
                             "mo.dPODate as 'customerDemandDate', mo.cMemo as 'remark','' as 'sourceDocNum'," +
-                            "mo.cDefine5 as headerAttributeBigint2,mo.cDefine11 as headerAttributeString1,mo.cDefine12 as headerAttributeString3," +
+                            "mo.cDefine5 as headerAttributeBigint2,ex.chdefine2 as headerAttributeString1,mo.cDefine12 as headerAttributeString3," +
                             "mo.cDefine13 as headerAttributeString4,mo.cDefine14 as headerAttributeString5,mo.cVenBank as headerAttributeString7," +
                             "mo.cVenAccount as headerAttributeString8,mo.cCurrentAuditor as headerAttributeString12," +
                             "mo.cMaker as 'customerContacts',hr1.cPsn_Name as headerAttributeString10,mo.cAuditDate as cAuditDate," +
@@ -154,6 +156,7 @@ public class POPomainController implements ApplicationContextAware {
                             "on mo.cPersonCode = hr1.cPsn_Num " +
                             "left join foreigncurrency curr " +
                             "on mo.cexch_name = curr.cexch_name " +
+                            "left join PO_POmain_extradefine ex on mo.POID = ex.POID " +
                             "where ((cAuditTime>'"+lasttimeSf+"' or cChangAuditTime >'"+lasttimeSf+"' and cDefine16 is null) or(cAuditTime>'"+lasttimeSf+"' or cChangAuditTime >'"+lasttimeSf+"' and cDefine16 = 1)) and mo.iverifystateex = 2  order by mo.cAuditTime desc";
                     List<Map<String, Object>> list = iSenYuDataSourceThree.queryForList(sql);
                     for(Map<String, Object> map:list){

jeecg-boot-module-system/src/main/java/org/jeecg/modules/openApi/service/impl/PurchaseWarehousingServiceImpl.java

@@ -993,6 +993,11 @@ public class PurchaseWarehousingServiceImpl extends ServiceImpl<PurchaseWarehous
                 //根据订单号获取委外订单
                 Map<String,Object> OM_MOmainMap=this.baseMapper.getOM_MOmainBycCode(String.valueOf(map.get("CORDERCODE")));
                 if(OM_MOmainMap!=null){
+                    //根据供应商查仓库
+                    String supplierCode = this.baseMapper.querySupplierCode(map.get("supplierCode").toString());
+                   // map.put("CWHCODE",OM_MOmainMap.get("cOWhCode"));
+                    map.put("CWHCODE",supplierCode);//出库编码
+                    map.put("CRDCODE","22");//出库类别
                     map.put("CPERSONCODE",OM_MOmainMap.get("cPersonCode"));//业务员编码
                     map.put("IEXCHRATE",getDecimalNew(String.valueOf(OM_MOmainMap.get("nflat"))).doubleValue());//汇率
                     map.put("CEXCH_NAME",OM_MOmainMap.get("cexch_name"));//币种名称
@@ -1038,6 +1043,8 @@ public class PurchaseWarehousingServiceImpl extends ServiceImpl<PurchaseWarehous
                                     getcFree(itemMap, OM_MOMaterialsList.get(0));
                                     itemMap.put("AUTOID_PO",OM_MOMaterialsList.get(0).get("MOMaterialsID"));//委外订单自件id
                                     itemMap.put("ALLCAUTOIDCOL","MOMaterialsID");//子件id字段名
+                                    itemMap.put("CINVCODE",OM_MOMaterialsList.get(0).get("cInvCode"));
+
                                 }else{
                                     throw new RuntimeException("第"+rowId+"行找到多个对应委外订单子件行");
                                 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/util/JsonChangeUtils.java

@@ -93,7 +93,7 @@ public class JsonChangeUtils implements ApplicationContextAware{
                 BigDecimal totalAmount = BigDecimal.ZERO; //总金额
                 BigDecimal exTaxAmount = BigDecimal.ZERO;//总无税金额
                 String sql = "select mo.iVouchRowNo as 'poLineNum',mo.MODetailsID as MODetailsID,mo.MODetailsID as 'moDetailId','"+map.get("pkorg")+"' as pkorg," +
-                        "'' as receivingInventoryOrgCode,'"+map.get("moId")+"' as MOID,'"+map.get("accId")+"' as 'accId',mo.cDefine37 as cDdfine37," +
+                        "'' as receivingInventoryOrgCode,'"+map.get("moId")+"' as MOID,'"+map.get("accId")+"' as 'accId',mo.cDefine37 as bomDate," +
                         "'"+map.get("poNum")+"' as poNum,mo.cInvCode as 'customerItemCode',inv.cInvName as 'itemName',mo.dArriveDate as 'customerDemandDate', " +
                         "'' as 'poLineStatus',mo.cFree1 as cFree1,mo.cFree2 as cFree2,mo.cFree3 as cFree3,mo.cFree4 as cFree4," +
                         "mo.cFree5 as cFree5,mo.cFree6 as cFree6,mo.cFree7 as cFree7,mo.cFree8 as cFree8,mo.cFree9 as cFree9,mo.cFree10 as cFree10,mo.iQuantity as 'customerDemandQty',mo.cUnitID as 'customerUomCode'," +
@@ -121,7 +121,7 @@ public class JsonChangeUtils implements ApplicationContextAware{
                 BigDecimal totalAmount = BigDecimal.ZERO; //总金额
                 BigDecimal exTaxAmount = BigDecimal.ZERO;//总无税金额
                 String sql = "select mo.iVouchRowNo as 'poLineNum',mo.MODetailsID as MODetailsID,mo.MODetailsID as 'moDetailId','"+map.get("pkorg")+"' as pkorg," +
-                        "'' as receivingInventoryOrgCode,'"+map.get("moId")+"' as MOID,'"+map.get("accId")+"' as 'accId',mo.cDefine37 as cDdfine37," +
+                        "'' as receivingInventoryOrgCode,'"+map.get("moId")+"' as MOID,'"+map.get("accId")+"' as 'accId',mo.cDefine37 as bomDate," +
                         "'"+map.get("poNum")+"' as poNum,mo.cInvCode as 'customerItemCode',inv.cInvName as 'itemName',mo.dArriveDate as 'customerDemandDate', " +
                         "'' as 'poLineStatus',mo.cFree1 as cFree1,mo.cFree2 as cFree2,mo.cFree3 as cFree3,mo.cFree4 as cFree4," +
                         "mo.cFree5 as cFree5,mo.cFree6 as cFree6,mo.cFree7 as cFree7,mo.cFree8 as cFree8,mo.cFree9 as cFree9,mo.cFree10 as cFree10,mo.iQuantity as 'customerDemandQty',mo.cUnitID as 'customerUomCode'," +
@@ -150,7 +150,7 @@ public class JsonChangeUtils implements ApplicationContextAware{
                 BigDecimal totalAmount = BigDecimal.ZERO; //总金额
                 BigDecimal exTaxAmount = BigDecimal.ZERO;//总无税金额
                 String sql = "select mo.iVouchRowNo as 'poLineNum',mo.MODetailsID as MODetailsID,mo.MODetailsID as 'moDetailId','"+map.get("pkorg")+"' as pkorg," +
-                        "'' as receivingInventoryOrgCode,'"+map.get("moId")+"' as MOID,'"+map.get("accId")+"' as 'accId',mo.cDefine37 as cDdfine37," +
+                        "'' as receivingInventoryOrgCode,'"+map.get("moId")+"' as MOID,'"+map.get("accId")+"' as 'accId',mo.cDefine37 as bomDate," +
                         "'"+map.get("poNum")+"' as poNum,mo.cInvCode as 'customerItemCode',inv.cInvName as 'itemName',mo.dArriveDate as 'customerDemandDate', " +
                         "'' as 'poLineStatus',mo.cFree1 as cFree1,mo.cFree2 as cFree2,mo.cFree3 as cFree3,mo.cFree4 as cFree4," +
                         "mo.cFree5 as cFree5,mo.cFree6 as cFree6,mo.cFree7 as cFree7,mo.cFree8 as cFree8,mo.cFree9 as cFree9,mo.cFree10 as cFree10,mo.iQuantity as 'customerDemandQty',mo.cUnitID as 'customerUomCode'," +
@@ -228,7 +228,7 @@ public class JsonChangeUtils implements ApplicationContextAware{
                         "mo.cInvCode as 'customerItemCode',inv.cInvName as 'itemName','' as 'poLineStatus',mo.dArriveDate as 'customerDemandDate'," +
                         "'' as receivingInventoryOrgCode,mo.cFree1 as cFree1,mo.cFree2 as cFree2,mo.cFree3 as cFree3,mo.cFree4 as cFree4,mo.cDefine23 as 'lineAttributeString11'," +
                         "mo.cFree5 as cFree5,mo.cFree6 as cFree6,mo.cFree7 as cFree7,mo.cFree8 as cFree8,mo.cFree9 as cFree9,mo.cFree10 as cFree10,mo.iQuantity as 'customerDemandQty',mo.cUnitID as 'customerUomCode'," +
-                        "mo.iMoney as 'iMoney',mo.iUnitPrice as supplierExTaxPrice,'"+map.get("cAuditDate")+"' as lineAttributeDatetime2,mo.cDefine37 as cDdfine37," +
+                        "mo.iMoney as 'iMoney',mo.iUnitPrice as supplierExTaxPrice,'"+map.get("cAuditDate")+"' as lineAttributeDatetime2,mo.cDefine37 as bomDate," +
                         "mo.iTax as lineAttributeDecimal1,mo.cbCloseDate as lineAttributeDatetime1,mo.cDefine24 as lineAttributeString9,ex.cbdefine2 as lineAttributeString7,ex.cbdefine3 as lineAttributeString8," +
                         "mo.iTaxPrice as 'customerPrice',(mo.iPerTaxRate/100) as 'lineTaxRate',mo.iSum as 'amount',mo.cDefine28 as 'lineAttributeString1'," +
                         "mo.cDefine32 as 'lineAttributeString2',mo.cDefine29 as 'lineAttributeString3','' as 'attributeString1',mo.cDefine30 as 'lineAttributeString4'," +
@@ -254,7 +254,7 @@ public class JsonChangeUtils implements ApplicationContextAware{
                         "mo.cInvCode as 'customerItemCode',inv.cInvName as 'itemName','' as 'poLineStatus',mo.dArriveDate as 'customerDemandDate'," +
                         "'' as receivingInventoryOrgCode,mo.cFree1 as cFree1,mo.cFree2 as cFree2,mo.cFree3 as cFree3,mo.cFree4 as cFree4,mo.cDefine23 as 'lineAttributeString11'," +
                         "mo.cFree5 as cFree5,mo.cFree6 as cFree6,mo.cFree7 as cFree7,mo.cFree8 as cFree8,mo.cFree9 as cFree9,mo.cFree10 as cFree10,mo.iQuantity as 'customerDemandQty',mo.cUnitID as 'customerUomCode'," +
-                        "mo.iMoney as 'iMoney',mo.iUnitPrice as supplierExTaxPrice,'"+map.get("cAuditDate")+"' as lineAttributeDatetime2,mo.cDefine37 as cDdfine37," +
+                        "mo.iMoney as 'iMoney',mo.iUnitPrice as supplierExTaxPrice,'"+map.get("cAuditDate")+"' as lineAttributeDatetime2,mo.cDefine37 as bomDate," +
                         "mo.iTax as lineAttributeDecimal1,mo.cbCloseDate as lineAttributeDatetime1,mo.cDefine24 as lineAttributeString9,ex.cbdefine2 as lineAttributeString7,ex.cbdefine3 as lineAttributeString8," +
                         "mo.iTaxPrice as 'customerPrice',(mo.iPerTaxRate/100) as 'lineTaxRate',mo.iSum as 'amount',mo.cDefine28 as 'lineAttributeString1'," +
                         "mo.cDefine32 as 'lineAttributeString2',mo.cDefine29 as 'lineAttributeString3','' as 'attributeString1',mo.cDefine30 as 'lineAttributeString4'," +
@@ -279,7 +279,7 @@ public class JsonChangeUtils implements ApplicationContextAware{
                         "mo.cInvCode as 'customerItemCode',inv.cInvName as 'itemName','' as 'poLineStatus',mo.dArriveDate as 'customerDemandDate'," +
                         "'' as receivingInventoryOrgCode,mo.cFree1 as cFree1,mo.cFree2 as cFree2,mo.cFree3 as cFree3,mo.cFree4 as cFree4,mo.cDefine23 as 'lineAttributeString11'," +
                         "mo.cFree5 as cFree5,mo.cFree6 as cFree6,mo.cFree7 as cFree7,mo.cFree8 as cFree8,mo.cFree9 as cFree9,mo.cFree10 as cFree10,mo.iQuantity as 'customerDemandQty',mo.cUnitID as 'customerUomCode'," +
-                        "mo.iMoney as 'iMoney',mo.iUnitPrice as supplierExTaxPrice,'"+map.get("cAuditDate")+"' as lineAttributeDatetime2,mo.cDefine37 as cDdfine37," +
+                        "mo.iMoney as 'iMoney',mo.iUnitPrice as supplierExTaxPrice,'"+map.get("cAuditDate")+"' as lineAttributeDatetime2,mo.cDefine37 as bomDate," +
                         "mo.iTax as lineAttributeDecimal1,mo.cbCloseDate as lineAttributeDatetime1,mo.cDefine24 as lineAttributeString9,ex.cbdefine2 as lineAttributeString7,ex.cbdefine3 as lineAttributeString8," +
                         "mo.iTaxPrice as 'customerPrice',(mo.iPerTaxRate/100) as 'lineTaxRate',mo.iSum as 'amount',mo.cDefine28 as 'lineAttributeString1'," +
                         "mo.cDefine32 as 'lineAttributeString2',mo.cDefine29 as 'lineAttributeString3','' as 'attributeString1',mo.cDefine30 as 'lineAttributeString4'," +
@@ -409,9 +409,9 @@ public class JsonChangeUtils implements ApplicationContextAware{
                 jf.put("lineAttributeDatetime1",lineAttributeDatetime1+" 00:00:00");
             }
 
-            if(oConvertUtils.isNotEmpty(map.get("cDdfine37"))){
-                String cDdfine37 = sf.format(map.get("cDdfine37"));
-                jf.put("cDdfine37",cDdfine37+" 00:00:00");
+            if(oConvertUtils.isNotEmpty(map.get("bomDate"))){
+                String bomDate = sf.format(map.get("bomDate"));
+                jf.put("bomDate",bomDate+" 00:00:00");
             }
 
             Set<String> keysCfree = mapCfree.keySet();
@@ -488,9 +488,9 @@ public class JsonChangeUtils implements ApplicationContextAware{
                 String lineAttributeDatetime1 = sf.format(map.get("lineAttributeDatetime1"));
                 jf.put("lineAttributeDatetime1",lineAttributeDatetime1+" 00:00:00");
             }
-            if(oConvertUtils.isNotEmpty(map.get("cDdfine37"))){
-                String cDdfine37 = sf.format(map.get("cDdfine37"));
-                jf.put("cDdfine37",cDdfine37+" 00:00:00");
+            if(oConvertUtils.isNotEmpty(map.get("bomDate"))){
+                String bomDate = sf.format(map.get("bomDate"));
+                jf.put("bomDate",bomDate+" 00:00:00");
             }
             //查询委外用料子表数据
             if(map.get("pkorg").equals("one")){