浏览代码

验收单导入单价保理4位

liuj 3 周之前
父节点
当前提交
e50c15997f

+ 1 - 2
src/main/java/com/inkasso/factoring/acceptanceManagement/service/ICAcceptanceBasicInfoService.java

@@ -96,8 +96,7 @@ public interface ICAcceptanceBasicInfoService extends IService<CAcceptanceBasicI
      * @param file
      * @return
      */
-    List<CAcceptanceGoodsExcelInfo> importGoodsInfo(MultipartFile file,
-        AcceptanceImportGoodsRequest acceptanceImportGoodsRequest);
+    List<CAcceptanceGoodsExcelInfo> importGoodsInfo(MultipartFile file, AcceptanceImportGoodsRequest acceptanceImportGoodsRequest);
 
 
     /**

+ 2 - 2
src/main/java/com/inkasso/factoring/acceptanceManagement/service/impl/CAcceptanceBasicInfoServiceImpl.java

@@ -602,10 +602,10 @@ public class CAcceptanceBasicInfoServiceImpl extends ServiceImpl<CAcceptanceBasi
                     throw new ValidatorException(CodeUtil.FAIL, "导入失败,销售单价或数量小数位数过长!");
                 }
                 if (goodsInfo.getReferencePrice() != null) {
-                    goodsInfo.setReferencePrice(goodsInfo.getReferencePrice().setScale(2, BigDecimal.ROUND_HALF_UP));
+                    goodsInfo.setReferencePrice(goodsInfo.getReferencePrice().setScale(4, BigDecimal.ROUND_HALF_UP));
                 }
                 if (goodsInfo.getFloatingPrice() != null) {
-                    goodsInfo.setFloatingPrice(goodsInfo.getFloatingPrice().setScale(2, BigDecimal.ROUND_HALF_UP));
+                    goodsInfo.setFloatingPrice(goodsInfo.getFloatingPrice().setScale(4, BigDecimal.ROUND_HALF_UP));
                 }
             }
             if(acceptanceImportGoodsRequest.getFlag()!=null && acceptanceImportGoodsRequest.getFlag() ==1){

+ 1 - 2
src/main/java/com/inkasso/factoring/acceptanceManagement/web/CAcceptanceController.java

@@ -89,8 +89,7 @@ public class CAcceptanceController {
      */
     @PostMapping("/doImportGoodsInfo")
     @ResponseBody
-    public ResponseJson doImportGoodsInfo(@RequestParam("file") MultipartFile file,
-        AcceptanceImportGoodsRequest acceptanceImportGoodsRequest) {
+    public ResponseJson doImportGoodsInfo(@RequestParam("file") MultipartFile file, AcceptanceImportGoodsRequest acceptanceImportGoodsRequest) {
         return new ResponseJson(acceptanceBasicInfoService.importGoodsInfo(file,acceptanceImportGoodsRequest));
     }