后台调整

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

@@ -436,6 +436,11 @@ public class FbsMomOrderdetail implements Serializable {
 	//部门名称
 	@TableField(exist = false)
 	private String cdepName;
+	//领料时间
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+	@DateTimeFormat(pattern="yyyy-MM-dd")
+	@TableField(exist = false)
+	private Date ddate;
 
 	//标准工时
 	@TableField(exist = false)

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

@@ -173,7 +173,8 @@
         i.cInvName,
         ma.cMaker,
         (mas.iQuantity - mas.fOutQuantity) as unfinishedQuantity,
-        d.cDepName
+        d.cDepName,
+        ma.dDate
         FROM
         MaterialAppVouchs mas
         LEFT JOIN MaterialAppVouch ma ON mas.ID= ma.ID

src/main/java/org/jeecg/modules/fbsQualityQualificationRate/controller/FbsQualityQualificationRateController.java

@@ -8,6 +8,8 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
@@ -234,4 +236,51 @@ public class FbsQualityQualificationRateController {
       return Result.ok("文件导入失败！");
   }
 
+  /**
+  * @Author chenchuang
+  * @Description //TODO 保存
+  * @Date 2020/11/7 18:07
+  * @Param [fbsQualityQualificationRate]
+  * @return org.jeecg.common.api.vo.Result<org.jeecg.modules.fbsQualityQualificationRate.entity.FbsQualityQualificationRate>
+  */
+  @PostMapping(value = "/addData")
+  public Result<FbsQualityQualificationRate> addData(@RequestBody FbsQualityQualificationRate fbsQualityQualificationRate){
+	  Result<FbsQualityQualificationRate> result=new Result<>();
+	  try {
+		  fbsQualityQualificationRateService.addData(fbsQualityQualificationRate);
+		  result.success("操作成功");
+	  } catch (Exception e) {
+		  e.printStackTrace();
+		  result.error500("操作失败："+e.getMessage());
+	  }
+	  return result;
+  }
+
+  /**
+  * @Author chenchuang
+  * @Description //TODO 查询未删除的数据
+  * @Date 2020/11/7 18:22
+  * @Param []
+  * @return org.jeecg.common.api.vo.Result<org.jeecg.modules.fbsQualityQualificationRate.entity.FbsQualityQualificationRate>
+  */
+  @GetMapping(value = "/getDataByDeflag")
+  public Result<FbsQualityQualificationRate> getDataByDeflag(){
+	  Result<FbsQualityQualificationRate> result=new Result<>();
+	  try {
+		  LambdaQueryWrapper<FbsQualityQualificationRate> lambdaQueryWrapper=new LambdaQueryWrapper<>();
+		  lambdaQueryWrapper.eq(FbsQualityQualificationRate::getDelFlag,"0");
+		  List<FbsQualityQualificationRate> fbsQualityQualificationRateList=fbsQualityQualificationRateService.list(lambdaQueryWrapper);
+		  if(fbsQualityQualificationRateList!=null&&fbsQualityQualificationRateList.size()>0){
+		  	result.setResult(fbsQualityQualificationRateList.get(0));
+		  }else{
+			  result.setResult(null);
+		  }
+		  result.success("操作成功");
+	  } catch (Exception e) {
+		  e.printStackTrace();
+		  result.error500("操作失败："+e.getMessage());
+	  }
+	  return result;
+  }
+
 }

src/main/java/org/jeecg/modules/fbsQualityQualificationRate/service/IFbsQualityQualificationRateService.java

@@ -10,5 +10,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @version： V1.0
  */
 public interface IFbsQualityQualificationRateService extends IService<FbsQualityQualificationRate> {
-
+    int addData(FbsQualityQualificationRate fbsQualityQualificationRate);
 }

src/main/java/org/jeecg/modules/fbsQualityQualificationRate/service/impl/FbsQualityQualificationRateServiceImpl.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.fbsQualityQualificationRate.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.jeecg.modules.fbsQualityQualificationRate.entity.FbsQualityQualificationRate;
 import org.jeecg.modules.fbsQualityQualificationRate.mapper.FbsQualityQualificationRateMapper;
 import org.jeecg.modules.fbsQualityQualificationRate.service.IFbsQualityQualificationRateService;
@@ -7,6 +8,8 @@ import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import javax.annotation.Resource;
+
 /**
  * @Description: 品质看板合格率统计表格数据
  * @author： jeecg-boot
@@ -16,4 +19,24 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class FbsQualityQualificationRateServiceImpl extends ServiceImpl<FbsQualityQualificationRateMapper, FbsQualityQualificationRate> implements IFbsQualityQualificationRateService {
 
+    @Resource
+    IFbsQualityQualificationRateService iFbsQualityQualificationRateService;
+
+    @Resource
+    FbsQualityQualificationRateMapper fbsQualityQualificationRateMapper;
+
+    @Override
+    public int addData(FbsQualityQualificationRate fbsQualityQualificationRate) {
+        //查询未删除的
+        LambdaQueryWrapper<FbsQualityQualificationRate> lambdaQueryWrapper=new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(FbsQualityQualificationRate::getDelFlag,"0");
+        //删除状态
+        FbsQualityQualificationRate fbsQualityQualificationRateUpdate=new FbsQualityQualificationRate();
+        fbsQualityQualificationRateUpdate.setDelFlag("1");
+        //修改
+        iFbsQualityQualificationRateService.update(fbsQualityQualificationRateUpdate,lambdaQueryWrapper);
+        //保存新记录
+        int result=fbsQualityQualificationRateMapper.insert(fbsQualityQualificationRate);
+        return result;
+    }
 }

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

@@ -273,12 +273,9 @@
             sum( fwdl.standard_working_hours ) as standard_working_hours,
             sum( fwdl.man_hours_completed ) as man_hours_completed,
             sum( fwdl.number_of_tasks ) as number_of_tasks,
-            sum( fws.qualified_number ) as  qualified_number
+            sum( fwdl.latest_completed_quantity ) as  latest_completed_quantity
         FROM
           fbs_workshop_dispatch_list fwdl
-        LEFT JOIN fbs_working_statistics fws ON fwdl.id = fws.pk_workshop_dispatch_list
-            AND fws.del_flag = '0'
-            AND fws.final_state = '3'
         WHERE
           fwdl.del_flag = '0'
         GROUP BY