1.图纸派工单增加检查功能,检查领取、套料图如果已经导入更新接收日期及反馈状态

src/main/java/com/dsic/gj_erp/controller/pgd/PgdTzjhController.java

@@ -1,15 +1,21 @@
 package com.dsic.gj_erp.controller.pgd;
 
 
+import cn.hutool.core.util.ObjUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.dsic.gj_erp.annotation.AuthFunction;
 import com.dsic.gj_erp.bean.ResultBean;
+import com.dsic.gj_erp.bean.jcsj.DmBclqjbp;
 import com.dsic.gj_erp.bean.jcsj.DmCbxxp;
 import com.dsic.gj_erp.bean.jcsj.DmDwxxp;
 import com.dsic.gj_erp.bean.jcsj.EmSbjgry;
+import com.dsic.gj_erp.bean.jhgk.DmTzjh;
 import com.dsic.gj_erp.bean.pgd.PgdTzjh;
 import com.dsic.gj_erp.exception.CustomException;
+import com.dsic.gj_erp.service.jcsj.DmBclqjbpService;
+import com.dsic.gj_erp.service.jcsj.DmBclqmxpService;
 import com.dsic.gj_erp.service.jcsj.DmCbxxpService;
 import com.dsic.gj_erp.service.jcsj.EmSbjgryService;
 import com.dsic.gj_erp.service.jcsj.impl.DmDwxxpService;
@@ -19,9 +25,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.HashMap;
+import java.util.*;
-import java.util.List;
+import java.util.stream.Collectors;
-import java.util.Map;
 
 /**
  * <p>
@@ -51,7 +56,18 @@ public class PgdTzjhController {
     @Autowired
     SYService syService;
 
-
+    /**
+     * 检查板材领取表,套料图是否导入,如果已经导入更新图纸计划为已反馈
+     * @param list
+     * @return
+     */
+    @AuthFunction
+    @PostMapping("checkTz")
+    public ResultBean<?> checkTz(@RequestBody List<PgdTzjh> list,HttpServletRequest request){
+        String username= (String) request.getAttribute("yhms");
+        pgdTzjhService.updateForCheck(list,username);
+        return new ResultBean<>();
+    }
 
 
 

src/main/java/com/dsic/gj_erp/service/pgd/PgdTzjhService.java

@@ -19,4 +19,5 @@ public interface PgdTzjhService extends IService<PgdTzjh> {
     void  saveTzjhPgdXd(List<PgdTzjh> tzjhs, HttpServletRequest request);
     void  saveTzjhPgdFk(List<PgdTzjh> tzjhs, HttpServletRequest request);
     void  saveTzjhPgdXdBack(List<PgdTzjh> tzjhs, HttpServletRequest request);
+    void updateForCheck(List<PgdTzjh> list,String username);
 }

src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdTzjhServiceImpl.java

@@ -1,17 +1,27 @@
 package com.dsic.gj_erp.service.pgd.impl;
 
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.dsic.gj_erp.bean.jcsj.DmBchxjbp;
+import com.dsic.gj_erp.bean.jcsj.DmBclqjbp;
 import com.dsic.gj_erp.bean.pgd.PgdTzjh;
 import com.dsic.gj_erp.mapper.pgd.PgdTzjhMapper;
+import com.dsic.gj_erp.service.jcsj.DmBchxjbpService;
+import com.dsic.gj_erp.service.jcsj.DmBclqjbpService;
 import com.dsic.gj_erp.service.pgd.PgdTzjhService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -22,8 +32,12 @@ import java.util.List;
  * @since 2023-11-13
  */
 @Service
+@AllArgsConstructor
 public class PgdTzjhServiceImpl extends ServiceImpl<PgdTzjhMapper, PgdTzjh> implements PgdTzjhService {
 
+    private final DmBclqjbpService dmBclqjbpService;
+    private final DmBchxjbpService dmBchxjbpService;
+
 
     @Transactional(rollbackFor = Exception.class)
     @Override
@@ -71,4 +85,51 @@ public class PgdTzjhServiceImpl extends ServiceImpl<PgdTzjhMapper, PgdTzjh> impl
         });
         this.updateBatchById(ups);
     }
+
+    /**
+     * 根据板材领取表和板材套料图,检查并更新图纸计划派工单完成情况
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updateForCheck(List<PgdTzjh> list,String username) {
+        Map<String, List<PgdTzjh>> map = list.stream()
+                .collect(Collectors.groupingBy(item -> item.getCzbh() + "_" + item.getPl()));
+
+        List<PgdTzjh> updateList=new ArrayList<>();
+        map.forEach((key,val)->{
+            List<PgdTzjh> tmpList=new ArrayList<>();
+            String czbh=key.split("_")[0];
+            String pl=key.split("_")[1];
+
+            List<DmBclqjbp> list1 = dmBclqjbpService.list(Wrappers.<DmBclqjbp>lambdaQuery()
+                    .eq(DmBclqjbp::getDcCh, czbh)
+                    .eq(DmBclqjbp::getDcPl, pl)
+            );
+            if (ObjUtil.isNotEmpty(list1)){
+                for(DmBclqjbp dmBclqjbp : list1){
+                    for (PgdTzjh pgdTzjh : val){
+                        if (dmBclqjbp.getDcFd().contains(pgdTzjh.getFd())){
+                            PgdTzjh updateData = new PgdTzjh();
+                            updateData.setId(pgdTzjh.getId());
+                            updateData.setZt("09");
+                            updateData.setFkrq(dmBclqjbp.getDerq());
+                            updateData.setFkry(username);
+                            tmpList.add(updateData);
+                        }
+                    }
+                }
+            }
+            if (ObjUtil.isEmpty(tmpList)){
+                return;
+            }
+            List<DmBchxjbp> list2 = dmBchxjbpService.list(Wrappers.<DmBchxjbp>lambdaQuery()
+                    .eq(DmBchxjbp::getDcCh, czbh)
+                    .eq(DmBchxjbp::getDcPl, pl)
+            );
+            if (ObjUtil.isNotEmpty(list2)){
+                updateList.addAll(tmpList);
+            }
+        });
+        boolean b = ObjUtil.isNotEmpty(updateList) && this.updateBatchById(updateList, 500);
+    }
 }