From 6d69df66a3072a7cfe255d34ab704c18affbbfa9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com> Date: Tue, 25 Mar 2025 18:03:18 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=AD=A3=E9=A2=84=E9=85=8D=E7=9B=98?= =?UTF-8?q?=E5=9B=A0bom=E4=B8=ADylbs=E7=BC=BA=E5=A4=B1=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=202.=E4=BF=AE=E6=AD=A3=E9=A2=84?= =?UTF-8?q?=E9=85=8D=E7=9B=98=E5=AE=8C=E6=95=B4=E6=A3=80=E6=9F=A5=E5=8F=AF?= =?UTF-8?q?=E8=83=BD=E4=BC=9A=E5=AF=BC=E8=87=B4=E6=95=B0=E6=8D=AE=E9=81=97?= =?UTF-8?q?=E6=BC=8F=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dsic/gj_erp/controller/zyjh/ZyjhController.java | 4 ++-- .../com/dsic/gj_erp/mapper/jhgk/DmYdjhMapper.java | 2 ++ .../com/dsic/gj_erp/service/zyjh/ZyjhService.java | 8 +------- src/main/resources/mappers/jhgk/DmYdjhMapper.xml | 12 +++++++++++- src/main/resources/mappers/zyjh/YppyzMapper.xml | 5 ++--- 5 files changed, 18 insertions(+), 13 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 6f13c88..2ed7981 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 @@ -101,8 +101,8 @@ public class ZyjhController { * 零件摆放,预配盘报工 */ @PostMapping("ppBGong") - public ResultBean ppBGong(@RequestBody List ppbGongDtoList){ - ppbGongDtoList.forEach(dto->{ + public ResultBean ppBGong(@RequestBody List ppBGongDtoList){ + ppBGongDtoList.forEach(dto->{ if (ObjUtil.isNotEmpty(dto.getLjList())){ List list=dto.getLjList(); zyjhService.ppBGong(list,dto.getDcCh(),dto.getDcPl(),dto.getZyq()); diff --git a/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmYdjhMapper.java b/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmYdjhMapper.java index 6441b1a..9985b30 100644 --- a/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmYdjhMapper.java +++ b/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmYdjhMapper.java @@ -22,6 +22,8 @@ import java.util.Map; */ public interface DmYdjhMapper extends BaseMapper { + int getNotPPLjCount(String dcch,String pl,String fd); + List getWithDjh(Integer zt,String zyq); List getWppljAndPpyz(String zyq1); 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 a8f5d7a..0f1e0c6 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 @@ -52,13 +52,7 @@ public class ZyjhService extends ServiceImpl { } public void ppwc(Integer id,String dcCh,String dcPl,String dcFd){ - int count = ljService.count(Wrappers.lambdaQuery() - .eq(DmYdjhLj::getCzbh, dcCh) - .eq(DmYdjhLj::getPl, dcPl) - .eq(DmYdjhLj::getFd, dcFd) - .isNull(DmYdjhLj::getQq) - .isNull(DmYdjhLj::getDw) - ); + int count = baseMapper.getNotPPLjCount(dcCh,dcPl,dcFd); if (count==0){ yppyzService.update(new UpdateWrapper().set("status","已摆放").eq("id",id)); } diff --git a/src/main/resources/mappers/jhgk/DmYdjhMapper.xml b/src/main/resources/mappers/jhgk/DmYdjhMapper.xml index 6b3f76a..c43747e 100644 --- a/src/main/resources/mappers/jhgk/DmYdjhMapper.xml +++ b/src/main/resources/mappers/jhgk/DmYdjhMapper.xml @@ -934,7 +934,7 @@ from dm_ydjh,dm_bom LEFT JOIN dm_qfxq on dm_qfxq.DC_CH=dm_bom.dcch and dm_qfxq.DC_PL=dm_bom.pl and dm_qfxq.DC_FD=dm_bom.fd WHERE - dm_ydjh.dc_ch= dm_bom.dcch + dm_ydjh.dc_ch= dm_bom.dcch and dm_bom.type='b' and dm_ydjh.dc_pl=dm_bom.pl and dm_ydjh.tzbh=dm_bom.tzbh and dm_ydjh.dc_ch=#{dcCh} and dm_ydjh.dc_pl=#{dcPl} and dm_ydjh.tzbh=#{tzbh} @@ -1214,6 +1214,16 @@ where dc_ch=#{dcch} and dc_pl =#{dcpl} order by a.dc_ch,a.dc_pl,a.tzbh + + UPDATE dm_ydjh set dm_ydjh.ylbs=dm_bchxylp.sfyl diff --git a/src/main/resources/mappers/zyjh/YppyzMapper.xml b/src/main/resources/mappers/zyjh/YppyzMapper.xml index 36eba93..193f6b1 100644 --- a/src/main/resources/mappers/zyjh/YppyzMapper.xml +++ b/src/main/resources/mappers/zyjh/YppyzMapper.xml @@ -28,8 +28,7 @@ dm_yppyz a, dm_ydjh b left join dm_ydjh_lj c on b.dc_ch=c.czbh and b.dc_pl=c.pl and b.tzbh=c.tlth where - a.dc_ch=b.dc_ch and a.dc_pl=b.dc_pl and a.dc_fd =c.fd - and a.status='已摆放' and b.zt>=62 + a.dc_ch=b.dc_ch and a.dc_pl=b.dc_pl and a.dc_fd =c.fd and a.status='已摆放' and b.lx='b' and b.zt>=62 and a.dc_ch=#{dcCh} @@ -50,7 +49,7 @@ dm_yppyz a, dm_ydjh b left join dm_ydjh_lj c on b.dc_ch=c.czbh and b.dc_pl=c.pl and b.tzbh=c.tlth where - a.dc_ch=b.dc_ch and a.dc_pl=b.dc_pl and a.dc_fd =c.fd + a.dc_ch=b.dc_ch and a.dc_pl=b.dc_pl and a.dc_fd =c.fd and b.lx='b' and a.status='设置垛位' and b.zt>=62 and b.zyq1=#{zyq} and a.dc_ch=#{dcCh} and isnull(c.qq,'')='' and isnull(c.dw,'')=''