1

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

@@ -190,13 +190,24 @@ public class PaymentManagementController {
                     tmp.setPureWeight(weight/2);
                     tmp.setAmountIngPayable(payable/2);
                     tmp.setOddNumbers(number.substring(4) + "1");
-                    if(tmp.getGrossWeight() == null){
-                        tmp.setGrossWeight(Float.parseFloat(" "));
+                    if(tmp.getGrossWeight() != null){
+                        tmp.setGrossWeightStr(tmp.getGrossWeight() + "");
                     }
-                    if(tmp.getTare() == null){
-                        tmp.setTare(Float.parseFloat(" "));
+                    else{
+                        tmp.setGrossWeightStr("");
                     }
-                    tmp.setRemarkss("车号:" + tmp.getCarNo() + "毛:" + tmp.getGrossWeight() + " 皮:" + tmp.getTare() + " 净:" + tmp.getNetWeight() + " 纯:" + weight + " 应付:" + payable + " 单号:" + m.replaceAll("").trim() + " ,★☆性质:贸易粮 形态:玉米堆（1）"
+                    if(tmp.getTare() != null){
+                        tmp.setTareStr(tmp.getTare() + "");
+                    }
+                    else{
+                        tmp.setTareStr("");
+                    }
+                    tmp.setRemarkss("车号:" + tmp.getCarNo() + "毛:" +
+                            tmp.getGrossWeightStr()
+                            + " 皮:" +
+                            tmp.getTareStr()
+                            + " 净:" +
+                            tmp.getNetWeight() + " 纯:" + weight + " 应付:" + payable + " 单号:" + m.replaceAll("").trim() + " ,★☆性质:贸易粮 形态:玉米堆（1）"
                     );
                     if(tmp.getGrade() == null){
                         tmp.setGrade(" ");
@@ -208,16 +219,26 @@ public class PaymentManagementController {
                     tmp1.setPureWeight(weight - tmp.getPureWeight());
                     tmp1.setAmountIngPayable(payable - tmp.getAmountIngPayable());
                     tmp1.setOddNumbers(number.substring(4) + "2");
-                    if(tmp1.getGrossWeight() == null){
-                        tmp1.setGrossWeight(Float.parseFloat(" "));
+                    if(tmp1.getGrossWeight() != null){
+                        tmp1.setGrossWeightStr(tmp1.getGrossWeight() + "");
+                    }
+                    else{
+                        tmp1.setGrossWeightStr("");
+                    }
+                    if(tmp1.getTare() != null){
+                        tmp1.setTareStr(tmp1.getTare() + "");
                     }
-                    if(tmp1.getTare() == null){
-                        tmp1.setTare(Float.parseFloat(" "));
+                    else{
+                        tmp1.setTareStr("");
                     }
                     if(tmp1.getGrade() == null){
                         tmp1.setGrade(" ");
                     }
-                    tmp1.setRemarkss("车号:" + tmp1.getCarNo() + "毛:" + tmp1.getGrossWeight() + " 皮:" + tmp1.getTare() + " 净:" + tmp1.getNetWeight() + " 纯:" + weight + " 应付:" + payable + " 单号:" + m.replaceAll("").trim() + " ,★☆性质:贸易粮 形态:玉米堆（2）"
+                    tmp1.setRemarkss("车号:" + tmp1.getCarNo() + "毛:" +
+                            tmp1.getGrossWeightStr()
+                            + " 皮:" +
+                            tmp1.getTareStr()
+                            + " 净:" + tmp1.getNetWeight() + " 纯:" + weight + " 应付:" + payable + " 单号:" + m.replaceAll("").trim() + " ,★☆性质:贸易粮 形态:玉米堆（2）"
                     );
                     list1.add(tmp1);
                 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/PaymentManagement.java

@@ -516,6 +516,17 @@ public class PaymentManagement extends BaseModel<PaymentManagement> {
      */
     @TableField(exist = false)
     private ContractManagementInfo contractManagement;
+
+    /**
+     * 毛重（公斤）
+     */
+    @TableField(exist = false)
+    private String grossWeightStr;
+    /**
+     * 皮重（公斤）
+     */
+    @TableField(exist = false)
+    private String tareStr;
     /**
      * 银行信息
      */

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

@@ -180,7 +180,11 @@ public class XmlUtil implements InitializingBean {
                 "\n" +
                 "<Gfdzdh>" + paymentManagement.getIdentityAuthenticationInfo().getCompAddress() + "</Gfdzdh>\n" +
                 "\n" +
-                "<Bz>车号:" + paymentManagement.getCarNo() + "毛:" + paymentManagement.getGrossWeight() + " 皮:" + paymentManagement.getTare() + " 净:" + paymentManagement.getNetWeight() + " 纯:" + paymentManagement.getPureWeight() + " 应付:" + paymentManagement.getAmountIngPayable() + " 单号:" + m.replaceAll("").trim() + " ,★☆性质:贸易粮 形态:玉米堆</Bz>\n" +
+                "<Bz>车号:" + paymentManagement.getCarNo() + "毛:" +
+                paymentManagement.getGrossWeight()==null?"":paymentManagement.getGrossWeight()
+                + " 皮:" +
+                paymentManagement.getTare()==null?"":paymentManagement.getTare()
+                + " 净:" + paymentManagement.getNetWeight() + " 纯:" + paymentManagement.getPureWeight() + " 应付:" + paymentManagement.getAmountIngPayable() + " 单号:" + m.replaceAll("").trim() + " ,★☆性质:贸易粮 形态:玉米堆</Bz>\n" +
                 "\n" +
                 "<Fhr/>\n" +
                 "\n" +
@@ -294,7 +298,11 @@ public class XmlUtil implements InitializingBean {
                 "\n" +
                 "<Gfdzdh>" + paymentManagement.getIdentityAuthenticationInfo().getCompAddress() + "</Gfdzdh>\n" +
                 "\n" +
-                "<Bz>车号:" + paymentManagement.getCarNo() + "毛:" + paymentManagement.getGrossWeight() + " 皮:" + paymentManagement.getTare() + " 净:" + paymentManagement.getNetWeight() + " 纯:" + paymentManagement.getPureWeight() + " 应付:" + paymentManagement.getAmountIngPayable() + " 单号:" + m.replaceAll("").trim() + " ,★☆性质:贸易粮 形态:玉米堆</Bz>\n" +
+                "<Bz>车号:" + paymentManagement.getCarNo() + "毛:" +
+                paymentManagement.getGrossWeightStr()
+                + " 皮:" +
+                paymentManagement.getTareStr()
+                + " 净:" + paymentManagement.getNetWeight() + " 纯:" + paymentManagement.getPureWeight() + " 应付:" + paymentManagement.getAmountIngPayable() + " 单号:" + m.replaceAll("").trim() + " ,★☆性质:贸易粮 形态:玉米堆</Bz>\n" +
                 "\n" +
                 "<Fhr/>\n" +
                 "\n" +