jz.kai 2 年之前
父節點
當前提交
892828bcc8

+ 1 - 1
web/src/main/java/com/jpsoft/prices/modules/base/controller/StandardController.java

@@ -537,7 +537,7 @@ public class StandardController {
                 output.close();
 
                 //todo 返回导入失败报表下载链接
-                msgResult.setData("/xls/" + fileName);
+                msgResult.setData("/prices-portal/xls/" + fileName);
             }
             else{
                 msgResult.setResult(true);

+ 4 - 0
web/src/main/java/com/jpsoft/prices/modules/open/InvoiceApiController.java

@@ -105,6 +105,10 @@ public class InvoiceApiController {
                                         Integer boxLength, Integer boxWidth, Integer boxHight, BigDecimal netWeight, BigDecimal grossWeight){
         MessageResult msgResult = new MessageResult<>();
 
+        if(grossWeight == null) {
+            grossWeight = netWeight.add(new BigDecimal(4));
+        }
+
         User user = userService.findByUserName(keyId);
         if(user.getPassword().equals(keySecret)) {
             Invoice invoice = invoiceService.get(invoiceId);