Browse Source

调整1235

chenchuang 2 years ago
parent
commit
e8088f468e

+ 9 - 7
src/main/java/org/jeecg/modules/fbsMomOrder/service/impl/FbsMomOrderServiceImpl.java

@@ -313,15 +313,17 @@ public class FbsMomOrderServiceImpl extends ServiceImpl<FbsMomOrderMapper, FbsMo
                             fbsTechnologicalProcessItem.setName(String.valueOf(PROCS.getJSONObject(i).get("DESCRIBE")));//工艺明细名称
                             fbsTechnologicalProcessItem.setCreateBy("adminSAP");
                             //将sap的分钟转化成小时
-                            int liveTimeTotle =0;
-                            double decimal=0.0;
+//                            int liveTimeTotle =0;
+//                            double decimal=0.0;
+                            BigDecimal STANDARDWORKINGHOURS=new BigDecimal("0.0");
                             if(PROCS.getJSONObject(i).get("STANDARDWORKINGHOURS")!=null){
-                                liveTimeTotle=getDecimalNew(PROCS.getJSONObject(i).get("STANDARDWORKINGHOURS")+"").intValue();
-                                int hours = (int) Math.floor(liveTimeTotle / 60);
-                                int minute = liveTimeTotle % 60;
-                                decimal = Double.parseDouble(String.valueOf(hours).concat(".").concat(String.valueOf(minute)));
+//                                liveTimeTotle=getDecimalNew(PROCS.getJSONObject(i).get("STANDARDWORKINGHOURS")+"").intValue();
+//                                int hours = (int) Math.floor(liveTimeTotle / 60);
+//                                int minute = liveTimeTotle % 60;
+//                                decimal = Double.parseDouble(String.valueOf(hours).concat(".").concat(String.valueOf(minute)));
+                                STANDARDWORKINGHOURS=getDecimalNew(PROCS.getJSONObject(i).get("STANDARDWORKINGHOURS")+"").divide(new BigDecimal("60"), 2, BigDecimal.ROUND_HALF_UP);
                             }
-                            fbsTechnologicalProcessItem.setStandardWorkingHours(getDecimalNew(String.valueOf(decimal)));//标准工时
+                            fbsTechnologicalProcessItem.setStandardWorkingHours(STANDARDWORKINGHOURS);//标准工时
                             fbsTechnologicalProcessItem.setSort(i);//排序
                             fbsTechnologicalProcessItemList.add(fbsTechnologicalProcessItem);
                         }