调整

src/main/java/org/jeecg/modules/fbsMomOrder/service/impl/FbsMomOrderServiceImpl.java

@@ -154,7 +154,7 @@ public class FbsMomOrderServiceImpl extends ServiceImpl<FbsMomOrderMapper, FbsMo
                 //判断是否无物料
                 if (InvCode == null || InvCode.equals("")) {//无物料则生成物料
                     SimpleDateFormat df = new SimpleDateFormat("yyMMdd");//设置日期格式
-                    String InvCodeNew = df.format(new Date())+((int)((Math.random()*9+1)*1000));//时间+四位随机数
+                    String InvCodeNew = df.format(new Date())+((int)((Math.random()*9+1)*100));//时间+三位随机数
                     fbsMomOrderdetail.put("InvCode", InvCodeNew);//存货编码
                     //保存存货
                     Map<String, Object> mapAdd = new HashMap<>();

src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/mapper/xml/FbsWorkshopDispatchListMapper.xml

@@ -457,8 +457,8 @@
     <select id="getListWhereStartEnd" resultType="org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList">
         SELECT
         *,
-        CONVERT ( IFNULL( (latest_completed_quantity), 0 )*IFNULL( (standard_working_hours_z), 0 ) / IFNULL( ( man_hours_completed  ), 0 ), DECIMAL ( 15, 2 ) ) * 100 as productionEfficiency,
-        CONVERT ( IFNULL( (latest_completed_quantity), 0 ) / IFNULL( ( number_of_tasks  ), 0 ), DECIMAL ( 15, 2 ) ) * 100 as achievementRate
+        CONVERT ( IFNULL( (latest_completed_quantity), 0 )*IFNULL( (standard_working_hours_z), 0 ) / IFNULL( ( man_hours_completed  ), 0 ), DECIMAL ( 15, 0 ) ) * 100 as productionEfficiency,
+        CONVERT ( IFNULL( (latest_completed_quantity), 0 ) / IFNULL( ( number_of_tasks  ), 0 ), DECIMAL ( 15, 0 ) ) * 100 as achievementRate
         ,(number_of_tasks-latest_completed_quantity) as remainingQuantity
         FROM
         fbs_workshop_dispatch_list