更新

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

@@ -1816,25 +1816,25 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 cell.setCellValue(new Formatter().format("%.3f", editFloat(exportVView.getNetWeightPrice())).toString());
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(20);
-                cell.setCellValue(editFloat(exportVView.getGrossWeight()));
+                cell.setCellValue(new Formatter().format("%.2f", editFloat(exportVView.getGrossWeight())).toString());
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(21);
-                cell.setCellValue(editFloat(exportVView.getTare()));
+                cell.setCellValue(new Formatter().format("%.2f", editFloat(exportVView.getTare())).toString());
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(22);
-                cell.setCellValue(editFloat(exportVView.getBuckleWeight()));
+                cell.setCellValue(new Formatter().format("%.2f", editFloat(exportVView.getBuckleWeight())).toString());
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(23);
-                cell.setCellValue(editFloat(exportVView.getNetWeight()));
+                cell.setCellValue(new Formatter().format("%.2f", editFloat(exportVView.getNetWeight())).toString());
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(24);
-                cell.setCellValue(editFloat(exportVView.getUnitDeduction()));
+                cell.setCellValue(new Formatter().format("%.2f", editFloat(exportVView.getUnitDeduction())).toString());
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(25);
                 cell.setCellValue(new Formatter().format("%.3f", editFloat(exportVView.getPureWeightPrice())).toString());
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(26);
-                cell.setCellValue(editFloat(exportVView.getPureWeight()));
+                cell.setCellValue(new Formatter().format("%.2f", editFloat(exportVView.getPureWeight())).toString());
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(27);
                 cell.setCellValue(new Formatter().format("%.2f", editFloat(exportVView.getAmountIngPayable())).toString());

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/WarehouseBaseInfoMapper.xml

@@ -98,7 +98,7 @@
         w.box_no_other as boxNoOther,
         w.title_no as titleNo,
         w.title_no_other as titleNoOther,
-        m.unit_contract_price as netWeightPrice,
+        m.unit_contract_price/1000 as netWeightPrice,
         s.gross_weight as grossWeight,
         s.tare as tare,
         s.deduction_weight as buckleWeight,
@@ -125,11 +125,11 @@
             AND s.warehouse_name= #{warehouseName}
         </if>
         <if test="startDate != null">
-            AND (DATE_FORMAT(s.create_date,"%Y%m%d") &gt;=
+            AND (DATE_FORMAT(w.in_out_date,"%Y%m%d") &gt;=
             DATE_FORMAT(#{startDate},"%Y%m%d"))
         </if>
         <if test="endDate != null">
-            AND (DATE_FORMAT(s.create_date,"%Y%m%d") &lt;=
+            AND (DATE_FORMAT(w.in_out_date,"%Y%m%d") &lt;=
             DATE_FORMAT(#{endDate},"%Y%m%d"))
         </if>
     </select>