|
|
@@ -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.cDdfine37 as cDdfine37," +
|
|
|
+ "'' as receivingInventoryOrgCode,'"+map.get("moId")+"' as MOID,'"+map.get("accId")+"' as 'accId',mo.cDefine37 as cDefine37," +
|
|
|
"'"+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.cDdfine37 as cDdfine37," +
|
|
|
+ "'' as receivingInventoryOrgCode,'"+map.get("moId")+"' as MOID,'"+map.get("accId")+"' as 'accId',mo.cDefine37 as cDefine37," +
|
|
|
"'"+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.cDdfine37 as cDdfine37," +
|
|
|
+ "'' as receivingInventoryOrgCode,'"+map.get("moId")+"' as MOID,'"+map.get("accId")+"' as 'accId',mo.cDefine37 as cDefine37," +
|
|
|
"'"+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.cDdfine37 as cDdfine37," +
|
|
|
+ "mo.iMoney as 'iMoney',mo.iUnitPrice as supplierExTaxPrice,'"+map.get("cAuditDate")+"' as lineAttributeDatetime2,mo.cDefine37 as cDefine37," +
|
|
|
"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.cDdfine37 as cDdfine37," +
|
|
|
+ "mo.iMoney as 'iMoney',mo.iUnitPrice as supplierExTaxPrice,'"+map.get("cAuditDate")+"' as lineAttributeDatetime2,mo.cDefine37 as cDefine37," +
|
|
|
"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.cDdfine37 as cDdfine37," +
|
|
|
+ "mo.iMoney as 'iMoney',mo.iUnitPrice as supplierExTaxPrice,'"+map.get("cAuditDate")+"' as lineAttributeDatetime2,mo.cDefine37 as cDefine37," +
|
|
|
"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,6 +409,11 @@ public class JsonChangeUtils implements ApplicationContextAware{
|
|
|
jf.put("lineAttributeDatetime1",lineAttributeDatetime1+" 00:00:00");
|
|
|
}
|
|
|
|
|
|
+ if(oConvertUtils.isNotEmpty(map.get("cDefine37"))){
|
|
|
+ String cDefine37 = sf.format(map.get("cDefine37"));
|
|
|
+ jf.put("cDefine37",cDefine37+" 00:00:00");
|
|
|
+ }
|
|
|
+
|
|
|
Set<String> keysCfree = mapCfree.keySet();
|
|
|
for (String key : keysCfree) {
|
|
|
jf.put("attributeCode"+ii, key);
|
|
|
@@ -483,6 +488,10 @@ public class JsonChangeUtils implements ApplicationContextAware{
|
|
|
String lineAttributeDatetime1 = sf.format(map.get("lineAttributeDatetime1"));
|
|
|
jf.put("lineAttributeDatetime1",lineAttributeDatetime1+" 00:00:00");
|
|
|
}
|
|
|
+ if(oConvertUtils.isNotEmpty(map.get("cDefine37"))){
|
|
|
+ String cDefine37 = sf.format(map.get("cDefine37"));
|
|
|
+ jf.put("cDefine37",cDefine37+" 00:00:00");
|
|
|
+ }
|
|
|
//查询委外用料子表数据
|
|
|
if(map.get("pkorg").equals("one")){
|
|
|
|
