Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/PaymentManagementServiceImpl.java

@@ -439,7 +439,9 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
                 PaymentManagement paymentManagement2 = this.selectById(paymentManagement1.getId());
                 //付款金额大于本次循环未付金额
                 if (money >= paymentManagement1.getAmountNotPayable()) {
-                    money = money - paymentManagement1.getAmountNotPayable();
+                    BigDecimal moneyx = new BigDecimal(Float.toString(money));
+                    BigDecimal moneyy = new BigDecimal(Float.toString(paymentManagement1.getAmountNotPayable()));
+                    money = moneyx.subtract(moneyy).floatValue();
                     //全部付款
                     paymentManagement1.setStatus(StatusEnum.PUR_PAYaLL.getName());
                     paymentManagement1.setStatusFlag(StatusEnum.PUR_PAYaLL.getFlag());
@@ -449,7 +451,9 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
                     paymentManagement1.setAmountNotPayable(0.0f);
                     this.updateById(paymentManagement1);
                 } else if (money > 0) {
-                    Float moneyTmp = money - paymentManagement1.getAmountNotPayable();
+                    BigDecimal moneyx = new BigDecimal(Float.toString(money));
+                    BigDecimal moneyy = new BigDecimal(Float.toString(paymentManagement1.getAmountNotPayable()));
+                    Float moneyTmp = moneyx.subtract(moneyy).floatValue();
                     //部分付款
                     paymentManagement1.setStatus(StatusEnum.PUR_PAY.getName());
                     paymentManagement1.setStatusFlag(StatusEnum.PUR_PAY.getFlag());

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/util/XmlUtil.java

@@ -103,6 +103,7 @@ public class XmlUtil implements InitializingBean {
         Matcher m = p.matcher(paymentManagement.getPaymentNo());
         String number = m.replaceAll("").trim();
         Float weight = paymentManagement.getNetWeight();
+        Float as = paymentManagement.getGrainMoney()/weight * 100;
         if(paymentManagement.getGoodsName().equals("玉米（潮粮）")){
             paymentManagement.setGoodsName("玉米");
             weight = paymentManagement.getPureWeight();
@@ -168,7 +169,7 @@ public class XmlUtil implements InitializingBean {
                 "\n" +
                 "<Yhzcsm/>\n" +
                 "\n" +
-                "<Dj>"+Math.round(paymentManagement.getGrainMoney()/weight * 100) * 0.01f+"</Dj>\n" +
+                "<Dj>"+paymentManagement.getGrainMoney()/weight * 100+"</Dj>\n" +
                 "\n" +
                 "<Sl>" + weight + "</Sl>\n" +
                 "\n" +