产线看板 品质

src/main/java/org/jeecg/modules/appInterface/entity/FbsWorkingStatistics.java

@@ -112,4 +112,12 @@ public class FbsWorkingStatistics implements Serializable {
 	//产品名称
 	@TableField(exist = false)
 	private String product;
+
+	//订单号
+	@TableField(exist = false)
+	private String productionOrderNumberName;
+
+	//产品编码
+	@TableField(exist = false)
+	private String productId;
 }

src/main/java/org/jeecg/modules/appInterface/mapper/FbsWorkingStatisticsMapper.java

@@ -23,4 +23,13 @@ public interface FbsWorkingStatisticsMapper extends BaseMapper<FbsWorkingStatist
     */
 //   List<FbsWorkingStatistics> getByMaterial(@Param("dateString")String dateString);
     Map<String,Object> getByMaterial(@Param("dateString")String dateString);
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 根据订单号和产品编码分组查询工时
+    * @Date 2020/11/7 12:51
+    * @Param []
+    * @return java.util.List<org.jeecg.modules.appInterface.entity.FbsWorkingStatistics>
+    */
+    List<FbsWorkingStatistics> getWorkingHours();
 }

src/main/java/org/jeecg/modules/appInterface/mapper/xml/FbsWorkingStatisticsMapper.xml

@@ -29,4 +29,20 @@
             AND fws.final_state = '3'
             AND date_format( fws.final_time, #{dateString} ) = DATE_FORMAT( now( ), #{dateString} )
     </select>
+
+    <select id="getWorkingHours" resultType="org.jeecg.modules.appInterface.entity.FbsWorkingStatistics">
+        SELECT
+            fwdl.production_order_number_name,
+            fwdl.product_id,
+            sum( fws.working_hours ) as working_hours
+        FROM
+            fbs_working_statistics fws
+            LEFT JOIN fbs_workshop_dispatch_list fwdl ON fws.pk_workshop_dispatch_list = fwdl.id
+        WHERE
+            fws.del_flag = '0'
+            AND fws.final_state IN ( '2', '3' )
+        GROUP BY
+            fwdl.production_order_number_name,
+            fwdl.product_id
+    </select>
 </mapper>

src/main/java/org/jeecg/modules/appInterface/service/IFbsWorkingStatisticsService.java

@@ -20,4 +20,13 @@ public interface IFbsWorkingStatisticsService extends IService<FbsWorkingStatist
     * @return java.util.List<org.jeecg.modules.appInterface.entity.FbsWorkingStatistics>
     */
     Map<String,Object> getByMaterial(String dateString);
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 根据订单号和产品编码分组查询工时
+    * @Date 2020/11/7 12:51
+    * @Param []
+    * @return java.util.List<org.jeecg.modules.appInterface.entity.FbsWorkingStatistics>
+    */
+    List<FbsWorkingStatistics> getWorkingHours();
 }

src/main/java/org/jeecg/modules/appInterface/service/impl/FbsWorkingStatisticsServiceImpl.java

@@ -37,4 +37,9 @@ public class FbsWorkingStatisticsServiceImpl extends ServiceImpl<FbsWorkingStati
 //        }
         return fbsWorkingStatisticsMapper.getByMaterial(dateString);
     }
+
+    @Override
+    public List<FbsWorkingStatistics> getWorkingHours() {
+        return fbsWorkingStatisticsMapper.getWorkingHours();
+    }
 }

src/main/java/org/jeecg/modules/fbsMomOrder/controller/FbsMomOrderdetailController.java

@@ -11,6 +11,8 @@ import javax.servlet.http.HttpServletResponse;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.appInterface.entity.FbsWorkingStatistics;
+import org.jeecg.modules.appInterface.service.IFbsWorkingStatisticsService;
 import org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail;
 import org.jeecg.modules.fbsMomOrder.service.IFbsMomOrderdetailService;
 
@@ -45,6 +47,9 @@ import com.alibaba.fastjson.JSON;
 public class FbsMomOrderdetailController {
 	@Autowired
 	private IFbsMomOrderdetailService fbsMomOrderdetailService;
+
+	@Autowired
+	private IFbsWorkingStatisticsService iFbsWorkingStatisticsService;
 	
 	/**
 	  * 分页列表查询
@@ -287,7 +292,21 @@ public class FbsMomOrderdetailController {
   public Result<List<FbsMomOrderdetail>> getMonthList(){
 	  Result<List<FbsMomOrderdetail>> result=new Result<>();
 	  try {
+	  	//U8数据
 		  List<FbsMomOrderdetail> fbsMomOrderdetailList=fbsMomOrderdetailService.getMonthList();
+		  //扫码记录的工时
+		  List<FbsWorkingStatistics> fbsWorkingStatisticsList=iFbsWorkingStatisticsService.getWorkingHours();
+		  //找到对应的单据匹配工时
+		  if(fbsMomOrderdetailList!=null&&fbsWorkingStatisticsList!=null){
+		  	for(FbsMomOrderdetail fbsMomOrderdetail:fbsMomOrderdetailList){
+		  		for(FbsWorkingStatistics fbsWorkingStatistics:fbsWorkingStatisticsList){
+		  			if(fbsMomOrderdetail.getMocode().equals(fbsWorkingStatistics.getProductionOrderNumberName())&&fbsMomOrderdetail.getCinvcode().equals(fbsWorkingStatistics.getProductId())){
+						fbsMomOrderdetail.setManHoursInvested(fbsWorkingStatistics.getWorkingHours()+"");
+					}
+				}
+			}
+		  }
+
 		  result.setResult(fbsMomOrderdetailList);
 		  result.success("操作成功");
 	  } catch (Exception e) {

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

@@ -436,4 +436,12 @@ public class FbsMomOrderdetail implements Serializable {
 	//部门名称
 	@TableField(exist = false)
 	private String cdepName;
+
+	//标准工时
+	@TableField(exist = false)
+	private String cinvDefine13;
+
+	//已投入工时
+	@TableField(exist = false)
+	private String manHoursInvested;
 }

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

@@ -37,6 +37,7 @@
             i.cInvCode,
             i.cInvStd,
             i.cInvName,
+            i.cInvDefine13,
             mo.Qty,
             mo.QualifiedInQty,
             m.Define12

src/main/java/org/jeecg/modules/fbsPuArrivalvouch/mapper/xml/FbsPuArrivalvouchMapper.xml

@@ -52,7 +52,7 @@
         LEFT JOIN Inventory i ON pps.cInvCode= i.cInvCode
         WHERE
         pps.iArrQTY- pps.freceivedqty <![CDATA[ <= ]]> 0
-
+        AND DateDiff(year, GetDate(), pp.dPODate ) = 0
     </select>
 
 

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

@@ -128,6 +128,9 @@ public class FbsWorkshopDispatchList implements Serializable {
     //行号
 	private String rowNumber;
 
+	//最新完成数量
+	private String latestCompletedQuantity;
+
     //合并行
 	@TableField(exist = false)
     private Integer mergeLines;

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

@@ -217,7 +217,7 @@
             LEFT JOIN ( SELECT * FROM fbs_working_statistics WHERE del_flag = '0' GROUP BY pk_workshop_dispatch_list ) pdl ON fwdl.id = pdl.pk_workshop_dispatch_list
         WHERE
             fwdl.del_flag = '0'
-            AND date_format( fwdl.date, '%d' ) = DATE_FORMAT( now( ), '%d' )
+            AND date_format( fwdl.date, '%Y-%m-%d' ) = DATE_FORMAT( now( ), '%Y-%m-%d' )
     </select>
 
     <select id="getProductList" resultType="org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList">

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

@@ -329,11 +329,12 @@ public class FbsWorkshopDispatchListServiceImpl extends ServiceImpl<FbsWorkshopD
     }
 
     @Override
-    public boolean writeBackManHoursCompleted(String manHoursCompleted,String fbsWorkshopDispatchListId) {
+    public boolean writeBackManHoursCompleted(String manHoursCompleted,String latestCompletedQuantity,String fbsWorkshopDispatchListId) {
         Boolean isReults=false;
         //根据id查询派工单
         FbsWorkshopDispatchList fbsWorkshopDispatchListGetById=fbsWorkshopDispatchListMapper.selectById(fbsWorkshopDispatchListId);
         fbsWorkshopDispatchListGetById.setManHoursCompleted(manHoursCompleted);//回写的完成工时
+        fbsWorkshopDispatchListGetById.setLatestCompletedQuantity(latestCompletedQuantity);//回写最新完成数量
         //回写
         int reultRow=fbsWorkshopDispatchListMapper.updateById(fbsWorkshopDispatchListGetById);
         if(reultRow>0){