|
|
@@ -102,8 +102,10 @@ public class XmlUtil implements InitializingBean {
|
|
|
Pattern p = Pattern.compile(regEx);
|
|
|
Matcher m = p.matcher(paymentManagement.getPaymentNo());
|
|
|
String number = m.replaceAll("").trim();
|
|
|
+ Float weight = paymentManagement.getNetWeight();
|
|
|
if(paymentManagement.getGoodsName().equals("玉米（潮粮）")){
|
|
|
paymentManagement.setGoodsName("玉米");
|
|
|
+ weight = paymentManagement.getPureWeight();
|
|
|
}
|
|
|
String s = "<?xml version=\"1.0\" encoding=\"GBK\"?>\n" +
|
|
|
"\n" +
|
|
|
@@ -132,7 +134,7 @@ public class XmlUtil implements InitializingBean {
|
|
|
"\n" +
|
|
|
"<Gfdzdh>" + paymentManagement.getIdentityAuthenticationInfo().getCompAddress() + "</Gfdzdh>\n" +
|
|
|
"\n" +
|
|
|
- "<Bz>车号:" + paymentManagement.getCarNo() + "毛:" + paymentManagement.getGrossWeight() + " 皮:" + paymentManagement.getTare() + " 净:" + paymentManagement.getNetWeight() + " 应付:" + paymentManagement.getGrainMoney() + " 整晒费:0 实付:" + paymentManagement.getActualPayment() + " 性质:贸易粮 单号:" + m.replaceAll("").trim() + " ,★☆性质:贸易粮 形态:玉米堆</Bz>\n" +
|
|
|
+ "<Bz>车号:" + paymentManagement.getCarNo() + "毛:" + paymentManagement.getGrossWeight() + " 皮:" + paymentManagement.getTare() + " 净:" + paymentManagement.getNetWeight() + " 纯:" + paymentManagement.getPureWeight() + " 应付:" + paymentManagement.getGrainMoney() + " 实付:" + paymentManagement.getActualPayment() + " 单号:" + m.replaceAll("").trim() + " ,★☆性质:贸易粮 形态:玉米堆</Bz>\n" +
|
|
|
"\n" +
|
|
|
"<Fhr/>\n" +
|
|
|
"\n" +
|
|
|
@@ -166,9 +168,9 @@ public class XmlUtil implements InitializingBean {
|
|
|
"\n" +
|
|
|
"<Yhzcsm/>\n" +
|
|
|
"\n" +
|
|
|
- "<Dj>"+paymentManagement.getTidalGrainPrice()+"</Dj>\n" +
|
|
|
+ "<Dj>"+Math.round(paymentManagement.getGrainMoney()/weight * 100) * 0.01f+"</Dj>\n" +
|
|
|
"\n" +
|
|
|
- "<Sl>" + paymentManagement.getNetWeight() + "</Sl>\n" +
|
|
|
+ "<Sl>" + weight + "</Sl>\n" +
|
|
|
"\n" +
|
|
|
"<Je>" + paymentManagement.getGrainMoney() + "</Je>\n" +
|
|
|
"\n" +
|
