From 0ea4429430143fc01f819c4306c549d248c2131f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com>
Date: Fri, 27 Dec 2024 16:37:17 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=88=92=E7=BA=BF=E5=88=87=E5=89=B2=E5=8F=8D?=
 =?UTF-8?q?=E9=A6=88=E5=9B=BE=E5=8F=B7=E5=A2=9E=E5=8A=A0=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=202.=E4=BD=9C=E4=B8=9A=E5=8F=8D=E9=A6=88=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E6=94=B9=E4=B8=BA=E6=8C=89?=
 =?UTF-8?q?=E7=8F=AD=E7=BB=84=E6=9F=A5=E8=AF=A2=202.=E5=88=92=E7=BA=BF?=
 =?UTF-8?q?=E5=88=87=E5=89=B2=E5=8F=8D=E9=A6=88=E4=BD=9C=E4=B8=9A=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E6=8C=89=E7=85=A7=E4=BD=9C=E4=B8=9A=E5=8C=BA=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/zyjh/ZyjhController.java       | 10 ++++++---
 .../dsic/gj_erp/service/zyjh/ZyjhService.java | 21 ++++++++++++++-----
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java b/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java
index 5c8ec52..3b1e968 100644
--- a/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java
+++ b/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java
@@ -38,7 +38,6 @@ import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
 @RestController
@@ -60,6 +59,11 @@ public class ZyjhController {
 
     private final MpDhsjServcie mpDhsjServcie;
 
+    @GetMapping("getBzryByBz")
+    public ResultBean<?> getBzryByBz(String zyq, String zt){
+        return new ResultBean<>(zyjhService.getBzryByBz(zyq,zt));
+    }
+
     /**
      * 抛丸导入
      */
@@ -162,8 +166,8 @@ public class ZyjhController {
      * 根据状态或班组长,获取作业计划,用于报工
      */
     @GetMapping("getYdjhByZtOrForeman")
-    public ResultBean<?> getYdjhByZtOrForeman(Integer zt,String foreman,String zyq){
-        List<DmYdjh> list = zyjhService.getYdjhByZtOrForeman(zt, foreman,zyq);
+    public ResultBean<?> getYdjhByZtOrForeman(Integer zt,String foreman,String zyq,String userCode){
+        List<DmYdjh> list = zyjhService.getYdjhByZtOrForeman(zt, foreman,userCode,zyq);
         return new ResultBean<>(list);
     }
 
diff --git a/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java b/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java
index 6949f86..5bb3ea5 100644
--- a/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java
+++ b/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java
@@ -68,7 +68,7 @@ public class ZyjhService extends ServiceImpl<DmYdjhMapper,DmYdjh> {
 
 
 
-    public List<DmYdjh> getYdjhByZtOrForeman(Integer zt,String foreman,String zyq){
+    public List<DmYdjh> getYdjhByZtOrForeman(Integer zt,String foreman,String userCode,String zyq){
         QueryWrapper<DmYdjh> wrapper = new QueryWrapper<DmYdjh>()
                 .ge("zt",11)
                 .ge(ObjUtil.isNotEmpty(zt),"zt",zt)
@@ -76,16 +76,22 @@ public class ZyjhService extends ServiceImpl<DmYdjhMapper,DmYdjh> {
 
         switch (zt){
             case 31:
-                wrapper.eq("pwpgry",foreman).isNull("pwfkry");
+//                wrapper.eq(!"1".equals(foreman),"pwpgry",foreman);
+//                wrapper.eq("1".equals(foreman),"pwpgry",userCode);
+                wrapper.isNull("pwfkry");
                 break;
             case 51:
-                wrapper.eq("hxpgry",foreman).isNull("hxfkry");
+//                wrapper.eq(!"1".equals(foreman),"hxpgry",foreman);
+//                wrapper.eq("1".equals(foreman),"hxpgry",userCode);
+                wrapper.isNull("hxfkry");
                 break;
             case 61:
-                wrapper.eq("qgpgry",foreman).isNull("qgfkry");
+//                wrapper.eq(!"1".equals(foreman),"qgpgry",foreman);
+//                wrapper.eq("1".equals(foreman),"qgpgry",userCode);
+                wrapper.isNull("qgfkry");
                 break;
         }
-        wrapper.orderByDesc("dc_ch","dc_pl,dc_fd,tzbh");
+        wrapper.orderByDesc("dc_ch","dc_pl,tzbh");
         return list(wrapper);
     }
 
@@ -138,6 +144,11 @@ public class ZyjhService extends ServiceImpl<DmYdjhMapper,DmYdjh> {
         return bzryService.list(Wrappers.<DmBzry>lambdaQuery()
                 .eq(DmBzry::getForeman, "1").eq(DmBzry::getZyq, zyq));
     }
+
+    public List<DmBzry> getBzryByBz(String zyq,String bz){
+        return bzryService.list(Wrappers.<DmBzry>lambdaQuery()
+                .eq(DmBzry::getResourcesCode, bz).eq(DmBzry::getZyq, zyq).orderByAsc(DmBzry::getUserName));
+    }
     /**
      * 获取所有未处理批次
      */