1.调整优化

2.增加零件派工功能

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

@@ -1,6 +1,7 @@
 package com.dsic.gj_erp.controller.pgd;
 
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.dsic.gj_erp.annotation.AuthFunction;
@@ -42,6 +43,24 @@ public class PgdQmjhController {
     @Autowired
     PgdQmjhMapper pgdQmjhMapper;
 
+    @PostMapping("pg")
+    public ResultBean<?> pg(@RequestBody List<DmYdjhLj> list){
+        String date = DateUtil.date().toString("yyyy/MM/dd");
+        list.forEach(item->{
+            if ("Y".equals(item.getPkbs())){
+                item.setPkXfrq(date);
+            }
+            if ("Y".equals(item.getQbs())){
+                item.setQjgXfrq(date);
+            }
+            if ("Y".equals(item.getDmbs())){
+                item.setDmXfrq(date);
+            }
+        });
+        dmYdjhLjService.updateBatchById(list);
+        return new ResultBean<>();
+    }
+
 
 
     @PostMapping("/getQmPgd")
@@ -54,6 +73,9 @@ public class PgdQmjhController {
         qw.eq(StrUtil.isNotEmpty((String)map.get("pl")),"pl",(String)map.get("pl"));
         qw.eq(StrUtil.isNotEmpty((String)map.get("fd")),"fd",(String)map.get("fd"));
         qw.eq(StrUtil.isNotEmpty((String)map.get("zt")),"qjg_zt",(String)map.get("zt"));
+        qw.eq(StrUtil.isNotEmpty((String)map.get("dmry")),"dmry",(String)map.get("dmry"));
+        qw.eq(StrUtil.isNotEmpty((String)map.get("pkry")),"pkry",(String)map.get("pkry"));
+        qw.eq(StrUtil.isNotEmpty((String)map.get("qjgry")),"qjgry",(String)map.get("qjgry"));
         List<DmYdjhLj> dmYdjhLjs = pgdQmjhMapper.selectQmByQgAndJh(map);
         //  qw.eq("qbs","Y");
 

src/main/resources/mappers/pgd/PgdQmjhMapper.xml

@@ -166,6 +166,24 @@
         dm_ydjh.dc_pl= dm_ydjh_lj.fd
 
         where 1=1
+        <if test=" qjgry!=null and qjgry!=''">
+            and   dm_ydjh_lj.pkry=#{pkry}
+        </if>
+        <if test=" pkry!=null and pkry!=''">
+            and   dm_ydjh_lj.pkry=#{pkry}
+        </if>
+        <if test=" dmry!=null and dmry!=''">
+            and   dm_ydjh_lj.dmry=#{dmry}
+        </if>
+        <if test=" qbs!=null and qbs!=''">
+            and   dm_ydjh_lj.qbs=#{qbs}
+        </if>
+        <if test=" pkbs!=null and pkbs!=''">
+            and   dm_ydjh_lj.pkbs=#{pkbs}
+        </if>
+        <if test=" dmbs!=null and dmbs!=''">
+            and   dm_ydjh_lj.dmbs=#{dmbs}
+        </if>
         <if test=" dcch!=null and dcch!=''">
             and   dm_ydjh_lj.czbh=#{dcch}
         </if>