From 06de0211a838da2dde01743769946460caeab514 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com> Date: Thu, 20 Mar 2025 16:58:54 +0800 Subject: [PATCH] =?UTF-8?q?1.=E9=A2=84=E9=85=8D=E7=9B=98=E6=91=86=E6=94=BE?= =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E3=80=81=E7=A1=AE=E8=AE=A4=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dsic/gj_erp/bean/zyjh/DmYppyz.java | 4 +++ .../controller/zyjh/DmYppyzController.java | 6 ++-- .../controller/zyjh/ZyjhController.java | 35 ++++++++++++++++--- .../com/dsic/gj_erp/dao/zyjh/PPBGongDto.java | 1 + .../gj_erp/mapper/zyjh/DmYppyzMapper.java | 2 ++ .../gj_erp/service/zyjh/DmYppyzService.java | 4 +++ .../dsic/gj_erp/service/zyjh/ZyjhService.java | 11 +++++- .../resources/mappers/zyjh/YppyzMapper.xml | 33 ++++++++++++++--- 8 files changed, 84 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/dsic/gj_erp/bean/zyjh/DmYppyz.java b/src/main/java/com/dsic/gj_erp/bean/zyjh/DmYppyz.java index cebb94a..6c3bd8a 100644 --- a/src/main/java/com/dsic/gj_erp/bean/zyjh/DmYppyz.java +++ b/src/main/java/com/dsic/gj_erp/bean/zyjh/DmYppyz.java @@ -49,6 +49,10 @@ public class DmYppyz extends Model { @TableField(exist = false) private List ljList; + public void 设置状态(String name){ + this.status=StatusEnum.valueOf(name); + } + public static StatusEnum 已设置垛位状态(){ return StatusEnum.设置垛位; } diff --git a/src/main/java/com/dsic/gj_erp/controller/zyjh/DmYppyzController.java b/src/main/java/com/dsic/gj_erp/controller/zyjh/DmYppyzController.java index b964be8..0f5292f 100644 --- a/src/main/java/com/dsic/gj_erp/controller/zyjh/DmYppyzController.java +++ b/src/main/java/com/dsic/gj_erp/controller/zyjh/DmYppyzController.java @@ -25,9 +25,9 @@ public class DmYppyzController { private final DmYppyzService service; - @PostMapping("bgList") - public ResultBean bgList(@RequestBody DmYppyz entity){ - List list = service.bgList(entity); + @PostMapping("wbfList") + public ResultBean wbfList(@RequestBody DmYppyz entity){ + List list = service.wbfList(entity); return new ResultBean<>(list); } 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 50fea9a..6f13c88 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 @@ -13,6 +13,7 @@ import com.dsic.gj_erp.bean.czzj.MpDhsj; import com.dsic.gj_erp.bean.jhgk.DmYdjh; import com.dsic.gj_erp.bean.jhgk.DmYdjhLj; import com.dsic.gj_erp.bean.kc.ImCkwpkwp; +import com.dsic.gj_erp.bean.zyjh.DmYppyz; import com.dsic.gj_erp.bean.zyjh.PwExcel; import com.dsic.gj_erp.bean.zyjh.Ycldw; import com.dsic.gj_erp.bean.zyjh.YcldwInfo; @@ -30,6 +31,7 @@ import com.dsic.gj_erp.wsclient.Message; import com.dsic.gj_erp.wsclient.WebSocketService; import lombok.AllArgsConstructor; import org.springframework.transaction.annotation.Transactional; +import org.springframework.transaction.support.TransactionTemplate; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -60,14 +62,39 @@ public class ZyjhController { private final MpDhsjServcie mpDhsjServcie; + private final TransactionTemplate transactionTemplate; + + @PostMapping("yppbg") + public ResultBean yppbg(@RequestBody List list){ + List updateList=new ArrayList<>(); + list.forEach(item->{ + transactionTemplate.execute((status)->{ + zyjhService.ppbg(item.getId()); + + if (item.getLjList()!=null){ + item.getLjList().forEach(lj->{ + DmYdjhLj dmYdjhLj = new DmYdjhLj(); + dmYdjhLj.setId(lj.getId()); + dmYdjhLj.setPpzt("03"); + updateList.add(dmYdjhLj); + }); + } + zyjhService.ppBGong(updateList,null,null,null); + + return true; + }); + }); + return new ResultBean<>(); + } + /** * 预配盘完整性检查 * 根据输入的船号、批次,分段,图号等信息检查已完工的作业计划零件是否已经摆放完全 */ @PostMapping("wzxjc") - public ResultBean wzxjc(@RequestBody DmYdjhLj lj){ - - return new ResultBean<>(); + public ResultBean wzxjc(@RequestBody DmYppyz yppyz){ + List ybf = zyjhService.getYbf(yppyz); + return new ResultBean<>(ybf); } /** @@ -79,7 +106,7 @@ public class ZyjhController { if (ObjUtil.isNotEmpty(dto.getLjList())){ List list=dto.getLjList(); zyjhService.ppBGong(list,dto.getDcCh(),dto.getDcPl(),dto.getZyq()); - zyjhService.ppwc(dto.getId(),dto.getDcCh(),dto.getDcPl()); + zyjhService.ppwc(dto.getId(),dto.getDcCh(),dto.getDcPl(),dto.getDcFd()); } }); return new ResultBean<>(); diff --git a/src/main/java/com/dsic/gj_erp/dao/zyjh/PPBGongDto.java b/src/main/java/com/dsic/gj_erp/dao/zyjh/PPBGongDto.java index 7b223b8..558ed0c 100644 --- a/src/main/java/com/dsic/gj_erp/dao/zyjh/PPBGongDto.java +++ b/src/main/java/com/dsic/gj_erp/dao/zyjh/PPBGongDto.java @@ -12,6 +12,7 @@ public class PPBGongDto { Integer id; String dcCh; String dcPl; + String dcFd; String zyq; List ljList; } diff --git a/src/main/java/com/dsic/gj_erp/mapper/zyjh/DmYppyzMapper.java b/src/main/java/com/dsic/gj_erp/mapper/zyjh/DmYppyzMapper.java index 6e04171..20a714b 100644 --- a/src/main/java/com/dsic/gj_erp/mapper/zyjh/DmYppyzMapper.java +++ b/src/main/java/com/dsic/gj_erp/mapper/zyjh/DmYppyzMapper.java @@ -9,4 +9,6 @@ import java.util.List; @Mapper public interface DmYppyzMapper extends BaseMapper { List bgList(DmYppyz entity); + List wbfList(DmYppyz entity); + } diff --git a/src/main/java/com/dsic/gj_erp/service/zyjh/DmYppyzService.java b/src/main/java/com/dsic/gj_erp/service/zyjh/DmYppyzService.java index 270dd88..76933f9 100644 --- a/src/main/java/com/dsic/gj_erp/service/zyjh/DmYppyzService.java +++ b/src/main/java/com/dsic/gj_erp/service/zyjh/DmYppyzService.java @@ -13,4 +13,8 @@ public class DmYppyzService extends ServiceImpl { public List bgList(DmYppyz entity) { return baseMapper.bgList(entity); } + + public List wbfList(DmYppyz entity) { + return baseMapper.wbfList(entity); + } } 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 866f9f6..a8f5d7a 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 @@ -43,10 +43,19 @@ public class ZyjhService extends ServiceImpl { private static final String MPDHSJ_KEY="MPDHSJ"; - public void ppwc(Integer id,String dcCh,String dcPl){ + public void ppbg(Integer id){ + yppyzService.update(new UpdateWrapper().set("status","已配送").eq("id",id)); + } + + public List getYbf(DmYppyz yppyz) { + return yppyzService.bgList(yppyz); + } + + 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) ); diff --git a/src/main/resources/mappers/zyjh/YppyzMapper.xml b/src/main/resources/mappers/zyjh/YppyzMapper.xml index ce889d0..36eba93 100644 --- a/src/main/resources/mappers/zyjh/YppyzMapper.xml +++ b/src/main/resources/mappers/zyjh/YppyzMapper.xml @@ -7,11 +7,12 @@ + - + @@ -21,13 +22,37 @@ + +