后台 看板问题修改

src/main/java/org/jeecg/common/util/ProductAuthUtil.java

@@ -34,7 +34,7 @@ public class ProductAuthUtil {
 			return true;
 		}
 		JSONObject reqParam = new JSONObject();
-		reqParam.put("productionCode", "FB896F1965907B9A9ED1BB2F0629A9C8");
+		reqParam.put("productionCode", "FB896F1965907B9A9ED1BB2F0629A9C7");
 		reqParam.put("computerInfo", JSON.toJSONString(HardwareUtil.get()));
 		String respParam = HttpUtils.sendPost("http://renzheng.cuidiansoft.com:8011/cuidian/pa/device/verify", JSON.toJSONString(reqParam), true);
 		JSONObject respObject = JSON.parseObject(respParam);

src/main/java/org/jeecg/modules/fbsMomOrder/entity/FbsMomOrderdetail.java

@@ -453,4 +453,8 @@ public class FbsMomOrderdetail implements Serializable {
 	//年月标识 查询当月订单用
 	@TableField(exist = false)
 	private String yearMonth;
+
+	//产品名称
+	@TableField(exist = false)
+	private String mocinvname;
 }

src/main/java/org/jeecg/modules/fbsMomOrder/mapper/xml/FbsMomOrderdetailMapper.xml

@@ -10,6 +10,7 @@
             MOD LEFT JOIN mom_order mo ON MOD.MoId = mo.MoId
         WHERE
             substring( mo.MoCode, 3, 4 ) = substring( CONVERT ( VARCHAR ( 100 ), GETDATE ( ), 112 ), 3, 4 )
+
     </select>
 
     <select id="getQualifiedInQty" resultType="org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail">
@@ -277,7 +278,7 @@
           mom_moallocate mm
         LEFT JOIN mom_orderdetail mo ON mm.MoDId= mo.MoDId
         LEFT JOIN mom_order m ON mo.MoId= m.MoId
-        LEFT JOIN Inventory i ON mo.InvCode= i.cInvCode
+            LEFT JOIN Inventory i ON mo.InvCode= i.cInvCode
         WHERE SUBSTRING ( m.MoCode, 3, 4 ) = SUBSTRING ( CONVERT ( VARCHAR ( 100 ), GETDATE( ), 112 ), 3, 4 )
         GROUP BY
             mo.MoId,
@@ -298,12 +299,14 @@
             m.MoCode,
             i.cinvname,
             i.cinvcode,
-            i.cinvstd
+            i.cinvstd,
+            moi.cinvname mocinvname
         FROM
           mom_moallocate mm
         LEFT JOIN mom_orderdetail mo ON mm.MoDId= mo.MoDId
         LEFT JOIN mom_order m ON mo.MoId= m.MoId
         LEFT JOIN Inventory i ON mm.InvCode= i.cInvCode
+        LEFT JOIN Inventory moi on moi.cInvCode=mo.InvCode
 				where mm.Qty-mm.IssQty>0 and mo.RelsUser is NOT NULL
 				AND SUBSTRING ( m.MoCode, 3, 4 ) = SUBSTRING ( CONVERT ( VARCHAR ( 100 ), GETDATE( ), 112 ), 3, 4 )
 				ORDER BY m.MoCode

src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/controller/FbsWorkshopDispatchListController.java

@@ -515,6 +515,7 @@ public class FbsWorkshopDispatchListController {
 			 fbsMomOrderdetailList.addAll(fbsMomOrderdetailList2);
 
 			 List<FbsWorkshopDispatchList> fbsWorkshopDispatchListList=fbsWorkshopDispatchListService.getSumDispatch(fbsMomOrderdetailList,fbsWorkshopDispatchList);
+
 			 result.setResult(fbsWorkshopDispatchListList);
 			 result.success("操作成功");
 		 } catch (Exception e) {
@@ -524,6 +525,15 @@ public class FbsWorkshopDispatchListController {
 		 return result;
 	 }
 
+	 //获取未完成的累计完成工时
+	 public BigDecimal getCodeList(List<FbsMomOrderdetail> fbsMomOrderdetailList){
+	 	List<String> list=new ArrayList<>();
+	 	for(FbsMomOrderdetail fbsMomOrderdetail:fbsMomOrderdetailList){
+			list.add(fbsMomOrderdetail.getMocode());
+		}
+		return fbsWorkshopDispatchListService.getOutstandingCumulativeWorkDone(list);
+	 }
+
 	 @GetMapping(value = "/export")
 	 public Result<List<FbsWorkshopDispatchList>> export(String month){
 		 Result<List<FbsWorkshopDispatchList>> result=new Result<>();

src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/entity/FbsWorkshopDispatchList.java

@@ -237,5 +237,9 @@ public class FbsWorkshopDispatchList implements Serializable {
 	@TableField(exist = false)
 	private Integer month;
 
+	//未完成累计工时
+	@TableField(exist = false)
+	private BigDecimal outstandingCumulativeWorkDoneTotal;
+
 
 }

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.fbsWorkshopDispatchList.mapper;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -167,4 +168,14 @@ public interface FbsWorkshopDispatchListMapper extends BaseMapper<FbsWorkshopDis
     * @return org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList
     */
     FbsWorkshopDispatchList getFirstFinalTime(@Param("pkWorkshopDispatchList")String pkWorkshopDispatchList);
+
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 查询未完成的单据已经花了多少时间
+    * @Date 2021/1/6 17:28
+    * @Param [listCode]
+    * @return java.lang.Double
+    */
+    BigDecimal getOutstandingCumulativeWorkDone(@Param("list") List<String> listCode);
 }

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

@@ -459,4 +459,15 @@
         WHERE
             pk_workshop_dispatch_list = #{pkWorkshopDispatchList}
     </select>
+
+    <select id="getOutstandingCumulativeWorkDone" resultType="java.math.BigDecimal">
+        SELECT
+          round( sum( IFNULL( man_hours_completed, 0 ) ), 1 )
+        FROM
+          fbs_workshop_dispatch_list
+        WHERE del_flag = '0' AND production_order_number_name IN
+            <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
+                            #{item}
+            </foreach>
+    </select>
 </mapper>

src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/service/IFbsWorkshopDispatchListService.java

@@ -4,6 +4,7 @@ import org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail;
 import org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -158,4 +159,14 @@ public interface IFbsWorkshopDispatchListService extends IService<FbsWorkshopDis
     * @return org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList
     */
     FbsWorkshopDispatchList getFirstFinalTime(String pkWorkshopDispatchList);
+
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 查询未完成的单据已经花了多少时间
+    * @Date 2021/1/6 17:32
+    * @Param [listCode]
+    * @return java.lang.Double
+    */
+    BigDecimal getOutstandingCumulativeWorkDone(List<String> listCode);
 }

src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/service/impl/FbsWorkshopDispatchListServiceImpl.java

@@ -150,11 +150,13 @@ public class FbsWorkshopDispatchListServiceImpl extends ServiceImpl<FbsWorkshopD
                                 fbsWorkshopDispatchList.setNumberOfTasks(getDecimal(Double.valueOf(formatDouble5(number_of_tasks.doubleValue()))));
                                 fbsWorkshopDispatchList.setStandardWorkingHours(formatDouble5(standard_working_hours.doubleValue()));
                                 fbsWorkshopDispatchList.setQualifiedNumber(new Double(qualified_number.doubleValue()).intValue());
+                                fbsWorkshopDispatchList.setManHoursCompleted(formatDouble5(man_hours_completed.doubleValue()));
                             }
 
 
                             isorder=true;
                             i++;
+
                         }
                     }
                     //没有则添加空的派工单
@@ -171,7 +173,7 @@ public class FbsWorkshopDispatchListServiceImpl extends ServiceImpl<FbsWorkshopD
                             if(man_hours_completed.doubleValue()>0.0){
 
                                 fbsWorkshopDispatchList.setProductionEfficiency(getDecimal(Double.valueOf(fbsWorkshopDispatchList.getStandardWorkingHoursZ())).multiply(qualified_number).divide(man_hours_completed,1,BigDecimal.ROUND_HALF_UP).multiply(getDecimal(100.0)).doubleValue()+"");
-                                fbsWorkshopDispatchList.setAchievementRate(qualified_number.divide(number_of_tasks,1,BigDecimal.ROUND_HALF_UP).multiply(getDecimal(100.0)).doubleValue()+"");
+                                fbsWorkshopDispatchList.setAchievementRate(qualified_number.divide(number_of_tasks,3,BigDecimal.ROUND_HALF_UP).multiply(getDecimal(100.0)).doubleValue()+"");
                             }
 
                         }
@@ -204,7 +206,9 @@ public class FbsWorkshopDispatchListServiceImpl extends ServiceImpl<FbsWorkshopD
         //获取生产名称合并行
         mergeLines(fbsWorkshopDispatchListListSum);
         //获取统计信息
-        getStatisticsTotal(fbsWorkshopDispatchListListSum,dateList);
+        if(fbsWorkshopDispatchListListSum!=null&&fbsWorkshopDispatchListListSum.size()>0){
+            getStatisticsTotal(fbsWorkshopDispatchListListSum,dateList);
+        }
         return fbsWorkshopDispatchListListSum;
     }
 
@@ -330,6 +334,7 @@ public class FbsWorkshopDispatchListServiceImpl extends ServiceImpl<FbsWorkshopD
         BigDecimal standardWorkingHoursActualTotal=new BigDecimal(0.00);//实际标准工时
         Integer quantityCompletedTotal=0;//累计完成数量
         BigDecimal manHoursCompletedTotal=new BigDecimal(0.00);//累计总工时
+        List<String> list=new ArrayList<>();
         //循环累加计算
         for(FbsWorkshopDispatchList workshopDispatchList:fbsWorkshopDispatchListList){
             if(isNumber(workshopDispatchList.getNumberOfTasksTotal())){
@@ -347,7 +352,7 @@ public class FbsWorkshopDispatchListServiceImpl extends ServiceImpl<FbsWorkshopD
             if(isNumber(workshopDispatchList.getManHoursCompletedTotal())){
                 manHoursCompletedTotal=manHoursCompletedTotal.add(getDecimal(Double.valueOf(workshopDispatchList.getManHoursCompletedTotal())));
             }
-
+            list.add(workshopDispatchList.getProductionOrderNumberName());
         }
         //获取按日期排列的统计数据
         List<FbsWorkshopDispatchList> fbsWorkshopDispatchListListTotal=new ArrayList<>();
@@ -411,7 +416,14 @@ public class FbsWorkshopDispatchListServiceImpl extends ServiceImpl<FbsWorkshopD
         fbsWorkshopDispatchList.setQuantityCompletedTotal(quantityCompletedTotal);
         fbsWorkshopDispatchList.setManHoursCompletedTotal(formatDouble5(manHoursCompletedTotal.doubleValue())+"");
         fbsWorkshopDispatchList.setFbsWorkshopDispatchListList(fbsWorkshopDispatchListListTotal);
-        fbsWorkshopDispatchList.setRemainingWorkTotal(formatDouble5(standardWorkingHoursTotal.subtract(manHoursCompletedTotal).doubleValue()));
+        //获取剩余工时
+        //获取未完成的累计完成工时
+        BigDecimal outstandingCumulativeWorkDone=fbsWorkshopDispatchListMapper.getOutstandingCumulativeWorkDone(list);
+        if(outstandingCumulativeWorkDone!=null){
+            //标准总工时
+            fbsWorkshopDispatchList.setRemainingWorkTotal(formatDouble5(standardWorkingHoursTotal.subtract(outstandingCumulativeWorkDone).doubleValue()));
+
+        }
         fbsWorkshopDispatchListList.add(fbsWorkshopDispatchList);
     }
 
@@ -570,5 +582,10 @@ public class FbsWorkshopDispatchListServiceImpl extends ServiceImpl<FbsWorkshopD
         return fbsWorkshopDispatchListMapper.getFirstFinalTime(pkWorkshopDispatchList);
     }
 
+    @Override
+    public BigDecimal getOutstandingCumulativeWorkDone(List<String> listCode) {
+        return fbsWorkshopDispatchListMapper.getOutstandingCumulativeWorkDone(listCode);
+    }
+
 
 }