Browse Source

数量默认四位小数

[user3] 4 năm trước cách đây
mục cha
commit
634dcbfd3c

+ 11 - 4
src/main/java/com/jeeplus/modules/sg/financial/settlement/service/DonorMaterialService.java

@@ -157,7 +157,9 @@ public class DonorMaterialService extends CrudService<DonorMaterialMapper, Donor
                     if (null == cellSix || "0".equals(cellSix) || "0.0".equals(cellSix)) {
                         continue;
                     } else {
-                        aDouble = getDouble(cellSix);
+                        BigDecimal bigDecimal = new BigDecimal(cellSix);
+                        BigDecimal bigDecimal1 = bigDecimal.setScale(4, BigDecimal.ROUND_HALF_UP);
+                        aDouble = bigDecimal1.doubleValue();
                     }
                     donorMaterial.setMaterialName(cellThree);
                     donorMaterial.setMaterialDescribe(cellFour);
@@ -288,12 +290,17 @@ public class DonorMaterialService extends CrudService<DonorMaterialMapper, Donor
                 String eqmMaterialDetails2 = material.getEqmMaterialDetails2();
                 //通过设备物料描述,项目定义号,查询物料是否存在,存在更新,不存在插入
                 int donor = donorMaterialMapper.findDonor(projectId, eqmMaterialDetails2);
+                //更新
+                BigDecimal bigDecimal = new BigDecimal( material.getMtlNumbers());
+                BigDecimal bigDecimal1 = bigDecimal.setScale(4, BigDecimal.ROUND_HALF_UP);
+                material.setMtlNumbers(bigDecimal1.doubleValue());
                 if (donor <= 0) {
                     //插入
                     material.preInsert();
                     donorMaterialMapper.insertErpOne(material,projectId,projectName);
                 } else {
-                    //更新
+
+
                     donorMaterialMapper.updateErpOne(material, projectId);
                 }
             }
@@ -314,8 +321,8 @@ public class DonorMaterialService extends CrudService<DonorMaterialMapper, Donor
                 }
                 BigDecimal erpNum = new BigDecimal(erpNum1);
                 BigDecimal exaNum = new BigDecimal(examinedNum);
-                erpNum.setScale(2, BigDecimal.ROUND_HALF_UP);
-                exaNum.setScale(2, BigDecimal.ROUND_HALF_UP);
+                erpNum.setScale(4, BigDecimal.ROUND_HALF_UP);
+                exaNum.setScale(4, BigDecimal.ROUND_HALF_UP);
                 int i = erpNum.compareTo(exaNum);
                 if (i != 0) {
                     if (null != remarks && !"".equals(remarks)) {