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

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

@@ -181,6 +181,7 @@ public class PaymentManagementController {
                     String regEx = "[^0-9]";
                     Pattern p = Pattern.compile(regEx);
                     Matcher m = p.matcher(tmp.getPaymentNo());
+                    String number = m.replaceAll("").trim();
                     //定义纯重和
                     Float weight = tmp.getPureWeight();
                     //定义应付金额和
@@ -188,6 +189,7 @@ public class PaymentManagementController {
                     //第一张发票
                     tmp.setPureWeight(weight/2);
                     tmp.setAmountIngPayable(payable/2);
+                    tmp.setOddNumbers(number.substring(4) + "（1）");
                     tmp.setRemarkss("车号:" + tmp.getCarNo() + "毛:" + tmp.getGrossWeight() + " 皮:" + tmp.getTare() + " 净:" + tmp.getNetWeight() + " 纯:" + weight + " 应付:" + payable + " 单号:" + m.replaceAll("").trim() + " ,★☆性质:贸易粮 形态:玉米堆（1）"
                     );
                     list1.add(tmp);
@@ -196,6 +198,7 @@ public class PaymentManagementController {
                     BeanUtils.copyProperties(tmp,tmp1);
                     tmp1.setPureWeight(weight - tmp.getPureWeight());
                     tmp1.setAmountIngPayable(payable - tmp.getAmountIngPayable());
+                    tmp1.setOddNumbers(number.substring(4) + "（2）");
                     tmp1.setRemarkss("车号:" + tmp1.getCarNo() + "毛:" + tmp1.getGrossWeight() + " 皮:" + tmp1.getTare() + " 净:" + 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

@@ -320,6 +320,12 @@ public class PaymentManagement extends BaseModel<PaymentManagement> {
     @TableField(exist = false)
     private String remarkss;
 
+    /**
+     * 单号
+     */
+    @TableField(exist = false)
+    private String oddNumbers;
+
     @TableField(exist = false)
     private String codeUrl;
     /**

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

@@ -296,7 +296,7 @@ public class XmlUtil implements InitializingBean {
                 "\n" +
                 "<Bz>车号:" + paymentManagement.getCarNo() + "毛:" + paymentManagement.getGrossWeight() + " 皮:" + paymentManagement.getTare() + " 净:" + paymentManagement.getNetWeight() + " 纯:" + paymentManagement.getPureWeight() + " 应付:" + paymentManagement.getAmountIngPayable() + " 单号:" + m.replaceAll("").trim() + " ,★☆性质:贸易粮 形态:玉米堆</Bz>\n" +
                 "\n" +
-                "<Fhr>" + commonStaff.getStaffName() + "</Fhr>\n" +
+                "<Fhr/>\n" +
                 "\n" +
                 "<Skr/>\n" +
                 "\n" +
@@ -362,9 +362,6 @@ public class XmlUtil implements InitializingBean {
 
     public String readsXml(PaymentManagement paymentManagement) {
 
-        //获取用户名称
-        CommonStaff commonStaff = staffService.getInfo(AuthSecurityUtils.getCurrentUserId());
-
         String regEx = "[^0-9]";
         Pattern p = Pattern.compile(regEx);
         Matcher m = p.matcher(paymentManagement.getPaymentNo());
@@ -397,7 +394,7 @@ public class XmlUtil implements InitializingBean {
                 "\n" +
                 "<Fp>\n" +
                 "\n" +
-                "<Djh>" + number.substring(4) + "</Djh>\n" +
+                "<Djh>" + paymentManagement.getOddNumbers() + "</Djh>\n" +
                 "\n" +
                 "<Gfmc>" + paymentManagement.getIdentityAuthenticationInfo().getCustomerName() + "</Gfmc>\n" +
                 "\n" +
@@ -409,7 +406,7 @@ public class XmlUtil implements InitializingBean {
                 "\n" +
                 "<Bz>" + paymentManagement.getRemarkss() + "</Bz>\n" +
                 "\n" +
-                "<Fhr>" + commonStaff.getStaffName() + "</Fhr>\n" +
+                "<Fhr/>\n" +
                 "\n" +
                 "<Skr/>\n" +
                 "\n" +