修改发票

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/PaymentManagementController.java

@@ -182,6 +182,10 @@ public class PaymentManagementController {
             List<PaymentManagement> list1 = new ArrayList<>();
             for(int i=0;i<paymentManagementList.size();i++){
                 PaymentManagement tmp = paymentManagementList.get(i);
+//                String goodsName = tmp.getGoodsName();
+//                if(tmp.getGoodsName()!= null && tmp.getGoodsName().contains("潮粮")) {
+//                    goodsName = tmp.getGoodsName().replace("（潮粮）", "");
+//                }
                 if(tmp.getAmountIngPayable() > 100000){
                     if(tmp.getPureWeight() == null){
                         tmp.setPureWeight(tmp.getNetWeight());
@@ -211,12 +215,8 @@ public class PaymentManagementController {
                     else{
                         tmp.setTareStr("");
                     }
-                    tmp.setRemarkss("车号:" + tmp.getCarNo() + "毛:" +
-                            tmp.getGrossWeightStr()
-                            + " 皮:" +
-                            tmp.getTareStr()
-                            + " 净:" +
-                            tmp.getNetWeight() + " 纯:" + weight + " 应付:" + payable + " 单号:" + m.replaceAll("").trim() + " 合同号:" + tmp.getContractNo() + " 仓库:" + tmp.getWarehouseName() + " ,★☆性质:贸易粮 形态:玉米堆（1）"
+                    tmp.setRemarkss("车号:" + tmp.getCarNo() + "毛:" + tmp.getGrossWeightStr() + " 皮:" + tmp.getTareStr() + " 净:" + tmp.getNetWeight()
+                            + " 纯:" + weight + " 应付:" + payable + " 合同号:" + tmp.getContractNo() + " 仓库:" + tmp.getWarehouseName()
                     );
                     if(tmp.getGrade() == null){
                         tmp.setGrade(" ");
@@ -243,11 +243,9 @@ public class PaymentManagementController {
                     if(tmp1.getGrade() == null){
                         tmp1.setGrade(" ");
                     }
-                    tmp1.setRemarkss("车号:" + tmp1.getCarNo() + "毛:" +
-                            tmp1.getGrossWeightStr()
-                            + " 皮:" +
-                            tmp1.getTareStr()
-                            + " 净:" + tmp1.getNetWeight() + " 纯:" + weight + " 应付:" + payable + " 单号:" + m.replaceAll("").trim() + " 合同号:" + tmp1.getContractNo() + " 仓库:" + tmp1.getWarehouseName() + " ,★☆性质:贸易粮 形态:玉米堆（2）"
+                    tmp1.setRemarkss("车号:" + tmp1.getCarNo() + "毛:" + tmp1.getGrossWeightStr() + " 皮:" + tmp1.getTareStr() + " 净:" + tmp1.getNetWeight()
+                                    + " 纯:" + weight + " 应付:" + payable + " 合同号:" + tmp1.getContractNo() + " 仓库:" + tmp1.getWarehouseName()
+//                            " ,★☆性质:贸易粮 形态:" + goodsName + "堆（2）"
                     );
                     list1.add(tmp1);
                 }

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

@@ -182,7 +182,7 @@ public class XmlUtil implements InitializingBean {
                 "<Gfdzdh>" + paymentManagement.getIdentityAuthenticationInfo().getCompAddress() + "</Gfdzdh>\n" +
                 "\n" +
                 "<Bz>车号:" + paymentManagement.getCarNo() + "毛:" + paymentManagement.getGrossWeight() + " 皮:" + paymentManagement.getTare()
-                + " 净:" + paymentManagement.getNetWeight() + " 纯:" + paymentManagement.getPureWeight() + " 应付:" + paymentManagement.getAmountIngPayable() + " 单号:" + m.replaceAll("").trim() + " 合同号:" + paymentManagement.getContractNo() + " 仓库:" + paymentManagement.getWarehouseName() + " ,★☆性质:贸易粮 形态:玉米堆</Bz>\n" +
+                + " 净:" + paymentManagement.getNetWeight() + " 纯:" + paymentManagement.getPureWeight() + " 应付:" + paymentManagement.getAmountIngPayable() + " 合同号:" + paymentManagement.getContractNo() + " 仓库:" + paymentManagement.getWarehouseName() + "</Bz>\n" +
                 "\n" +
                 "<Fhr/>\n" +
                 "\n" +
@@ -216,7 +216,7 @@ public class XmlUtil implements InitializingBean {
                 "\n" +
                 "<Yhzcsm/>\n" +
                 "\n" +
-                "<Dj>"+(Math.round((paymentManagement.getAmountIngPayable()/weight)*10000000))/10000000+"</Dj>\n" +
+                "<Dj>"+(double)Math.round((paymentManagement.getAmountIngPayable()/weight)*10000000)/10000000+"</Dj>\n" +
                 "\n" +
                 "<Sl>" + weight + "</Sl>\n" +
                 "\n" +
@@ -297,11 +297,8 @@ public class XmlUtil implements InitializingBean {
                 "\n" +
                 "<Gfdzdh>" + paymentManagement.getIdentityAuthenticationInfo().getCompAddress() + "</Gfdzdh>\n" +
                 "\n" +
-                "<Bz>车号:" + paymentManagement.getCarNo() + "毛:" +
-                paymentManagement.getGrossWeightStr()
-                + " 皮:" +
-                paymentManagement.getTareStr()
-                + " 净:" + paymentManagement.getNetWeight() + " 纯:" + paymentManagement.getPureWeight() + " 应付:" + paymentManagement.getAmountIngPayable() + " 单号:" + m.replaceAll("").trim() + " 合同号:" + paymentManagement.getContractNo() + " 仓库:" + paymentManagement.getWarehouseName() + " ,★☆性质:贸易粮 形态:玉米堆</Bz>\n" +
+                "<Bz>车号:" + paymentManagement.getCarNo() + "毛:" + paymentManagement.getGrossWeightStr() + " 皮:" + paymentManagement.getTareStr()
+                + " 净:" + paymentManagement.getNetWeight() + " 纯:" + paymentManagement.getPureWeight() + " 应付:" + paymentManagement.getAmountIngPayable() + " 合同号:" + paymentManagement.getContractNo() + " 仓库:" + paymentManagement.getWarehouseName() + "</Bz>\n" +
                 "\n" +
                 "<Fhr/>\n" +
                 "\n" +
@@ -337,7 +334,7 @@ public class XmlUtil implements InitializingBean {
                 "\n" +
                 "<Yhzcsm/>\n" +
                 "\n" +
-                "<Dj>"+(Math.round((paymentManagement.getAmountIngPayable()/weight)*10000000))/10000000+"</Dj>\n" +
+                "<Dj>"+(double)Math.round((paymentManagement.getAmountIngPayable()/weight)*10000000)/10000000+"</Dj>\n" +
                 "\n" +
                 "<Sl>" + weight + "</Sl>\n" +
                 "\n" +
@@ -378,7 +375,6 @@ public class XmlUtil implements InitializingBean {
         String goodsName = paymentManagement.getGoodsName();
         if(paymentManagement.getGoodsName()!= null && paymentManagement.getGoodsName().contains("潮粮")){
             goodsName = paymentManagement.getGoodsName().replace("（潮粮）","");
-//            paymentManagement.setGoodsName(goodsName);
 
             weight = paymentManagement.getPureWeight();
         }
@@ -448,7 +444,7 @@ public class XmlUtil implements InitializingBean {
                 "\n" +
                 "<Yhzcsm/>\n" +
                 "\n" + 
-                "<Dj>"+(Math.round((paymentManagement.getAmountIngPayable()/weight)*10000000))/10000000+"</Dj>\n" +
+                "<Dj>"+(double)Math.round((paymentManagement.getAmountIngPayable()/weight)*10000000)/10000000+"</Dj>\n" +
                 "\n" +
                 "<Sl>" + weight + "</Sl>\n" +
                 "\n" +