调整

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

@@ -47,7 +47,8 @@ public class ProductAuthUtil {
 		}
 
 		return success;
-
-
+//		isValid = true;
+//		validDate = DateUtils.getCalendar();
+//		return true;
 	}
 }

src/main/java/org/jeecg/modules/appInterface/controller/FbsWorkingStatisticsController.java

@@ -731,7 +731,7 @@ public class FbsWorkingStatisticsController {
 		 String cInvDefine13=iFbsInventoryService.getByInvCode(workshopDispatchList.getProductId());
 		 if(StringUtils.isEmpty(cInvDefine13)||Double.valueOf(cInvDefine13)<=0.0){
 			 //算出单个标准工时
-			 BigDecimal standardWorkingHoursZ =allHors.divide(allNum,1,BigDecimal.ROUND_HALF_UP);
+			 BigDecimal standardWorkingHoursZ =allHors.divide(allNum,2,BigDecimal.ROUND_HALF_UP);
 			 //erp修改单个数量的标准工时
 			 iFbsInventoryService.updateCInvDefine13(standardWorkingHoursZ.doubleValue()+"",workshopDispatchList.getProductId());
 			 //派工单修改单个数量的标准工时

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

@@ -106,6 +106,7 @@ public class FbsWorkingStatistics implements Serializable {
 	@Excel(name = "0保存，1提交", width = 15)
 	private String state;
 	//物料行号
+//	@TableField(exist = false)
 	private String rowNumber;
 
 	//工艺子表id

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

@@ -912,21 +912,46 @@ public class FbsWorkshopDispatchListController {
 					//根据派工的工艺主表id找到工艺明细
 					if(StringUtils.isNotBlank(fbsTechnologicalProcessId)){
 						if(fbsTechnologicalProcessId.equals(fbsTechnologicalProcessItem.getFbsTechnologicalProcessId())){
+							FbsTechnologicalProcessItem processItem=new FbsTechnologicalProcessItem();
+							processItem.setIsTechnological(fbsTechnologicalProcessItem.getIsTechnological());
+							processItem.setName(fbsTechnologicalProcessItem.getName());
+							processItem.setFbsTechnologicalProcessId(fbsTechnologicalProcessItem.getFbsTechnologicalProcessId());
 							//拿到工艺明细名称和派工中保存的进度工艺字符模糊查询是否存在  存在则定义标识代表完成
-							if(fbsTechnologicalProcessItemName.indexOf(fbsTechnologicalProcessItem.getName())>=0){
-								fbsTechnologicalProcessItem.setIsTechnological("1");
+							if(fbsTechnologicalProcessItemName.indexOf(processItem.getName())>=0){
+								processItem.setIsTechnological("1");
 							}else{
-								fbsTechnologicalProcessItem.setIsTechnological("2");
+								processItem.setIsTechnological("2");
 							}
-							fbsTechnologicalProcessItemListAdd.add(fbsTechnologicalProcessItem);
+							fbsTechnologicalProcessItemListAdd.add(processItem);
 						}
 					}
 				}
+				updateProcessItem(fbsTechnologicalProcessItemListAdd);
 				fbsWorkshopDispatchList.setFbsTechnologicalProcessItemList(fbsTechnologicalProcessItemListAdd);
 			}
 		}
 	 }
 
+	 public void updateProcessItem(List<FbsTechnologicalProcessItem> fbsTechnologicalProcessItemList){
+	 	if(fbsTechnologicalProcessItemList!=null&&fbsTechnologicalProcessItemList.size()>0){
+	 		Integer sort=0;
+			Integer i=0;
+			//获取最后一个完成的工序序号
+	 		for(FbsTechnologicalProcessItem fbsTechnologicalProcessItem:fbsTechnologicalProcessItemList){
+				if(StringUtils.isNotBlank(fbsTechnologicalProcessItem.getIsTechnological())&&fbsTechnologicalProcessItem.getIsTechnological().equals("1")){
+					sort=i;
+				}
+				i++;
+			}
+			if(sort!=0){
+	 			//把最后一个完成工序之前的工序通通默认为完成
+				for(int a=0;a<=sort;a++){
+					fbsTechnologicalProcessItemList.get(a).setIsTechnological("1");
+				}
+			}
+		}
+	 }
+
 	 /**
 	 * @Author chenchuang
 	 * @Description //TODO 产线看板：生产计划

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

@@ -128,6 +128,7 @@ public class FbsWorkshopDispatchList implements Serializable {
     private String projectName;
 
     //行号
+//	@TableField(exist = false)
 	private String rowNumber;
 
 	//最新完成数量

src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/job/FbsLatestCompletedQuantityUpdateJob.java

@@ -16,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
+import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
@@ -46,6 +47,7 @@ public class FbsLatestCompletedQuantityUpdateJob implements Job {
 
     public void show(){
         SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//设置日期格式
+        DecimalFormat dff = new DecimalFormat("#.0");
         //最近90天的派工数据
 //        QueryWrapper<FbsWorkshopDispatchList> queryWrapper=new QueryWrapper<>();
 //        queryWrapper.lambda().eq(FbsWorkshopDispatchList::getDelFlag,'0');
@@ -109,7 +111,8 @@ public class FbsLatestCompletedQuantityUpdateJob implements Job {
                             //算出相差的时间
                             differHour=differNumber.multiply(getDecimal(fbsWorkshopDispatchList.getStandardWorkingHoursZ()));
                             //累计在完成工时上
-                            fbsWorkshopDispatchList.setManHoursCompleted(manHoursCompleted.add(differHour)+"");
+                            System.out.println("1"+dff.format((manHoursCompleted.add(differHour)).doubleValue()));
+                            fbsWorkshopDispatchList.setManHoursCompleted(dff.format((manHoursCompleted.add(differHour)).doubleValue()));
                         }
 //                        //新增扫码记录
 //                        FbsWorkingStatistics fbsWorkingStatistics=new FbsWorkingStatistics();
@@ -140,7 +143,8 @@ public class FbsLatestCompletedQuantityUpdateJob implements Job {
                             //算出相差的时间
                             differHour=differNumber.multiply(getDecimal(fbsWorkshopDispatchList.getStandardWorkingHoursZ()));
                             //在完成工时上减掉
-                            fbsWorkshopDispatchList.setManHoursCompleted(manHoursCompleted.subtract(differHour)+"");
+                            System.out.println("2"+dff.format((manHoursCompleted.subtract(differHour)).doubleValue()));
+                            fbsWorkshopDispatchList.setManHoursCompleted( dff.format((manHoursCompleted.subtract(differHour)).doubleValue()));
                         }
 //                        LambdaQueryWrapper<FbsWorkingStatistics> fbsWorkingStatisticsLambdaQueryWrapper=new LambdaQueryWrapper<>();
 //                        fbsWorkingStatisticsLambdaQueryWrapper.eq(FbsWorkingStatistics::getDelFlag,"0");

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

@@ -498,7 +498,7 @@
             production_line_id,
             state,
             man_hours_completed,
-            row_number,
+            `row_number`,
             project_name,
             planned_quantity,
             standard_working_hours_z,