From 230b7acd8385c703724b86b0bf01f42c425f3347 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com> Date: Sat, 7 Sep 2024 17:29:32 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=AE=8C=E5=96=84=E6=8A=9B=E4=B8=B8=E5=8F=8D?= =?UTF-8?q?=E9=A6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/dsic/gj_erp/bean/zyjh/YcldwInfo.java | 2 +- .../dsic/gj_erp/controller/zyjh/ZyjhController.java | 6 ++++++ .../com/dsic/gj_erp/controller/zyjh/dto/PgDto.java | 3 +++ .../com/dsic/gj_erp/mapper/zyjh/YcldwInfoMapper.java | 2 ++ .../com/dsic/gj_erp/service/zyjh/YcldwInfoService.java | 10 ++++++++-- src/main/java/com/dsic/gj_erp/ws/WsHandler.java | 4 ++++ src/main/resources/mappers/zyjh/YcldwInfoMapper.xml | 4 ++++ 7 files changed, 28 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/dsic/gj_erp/bean/zyjh/YcldwInfo.java b/src/main/java/com/dsic/gj_erp/bean/zyjh/YcldwInfo.java index 1260acd..ae5f25f 100644 --- a/src/main/java/com/dsic/gj_erp/bean/zyjh/YcldwInfo.java +++ b/src/main/java/com/dsic/gj_erp/bean/zyjh/YcldwInfo.java @@ -51,7 +51,7 @@ public class YcldwInfo { this.zt=ZtEnum.BF; } - private void paowan(){ + public void paowan(){ this.zt=ZtEnum.PW; } 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 87413a4..bae9d2e 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 @@ -52,10 +52,16 @@ public class ZyjhController { String date=DateUtil.date().toString("yyyy/MM/dd"); for(DmYdjh dmYdjh:list){ field.set(dmYdjh,date); + dmYdjh.setJhlx(null); dmYdjh.setZtByZyjhzx(dto.getZxZtName()); } } + if ("PWFK".equals(dto.getZxZtName())){ + ycldwInfoService.updatePw(dto.getYcldwInfo()); + wsHandler.sendPwComplete((JSONObject) JSONObject.toJSON(dto.getYcldwInfo())); + } zyjhService.updateBatchById(list); + return new ResultBean<>(); } catch (NoSuchFieldException | IllegalAccessException e) { e.printStackTrace(); diff --git a/src/main/java/com/dsic/gj_erp/controller/zyjh/dto/PgDto.java b/src/main/java/com/dsic/gj_erp/controller/zyjh/dto/PgDto.java index 9e5cc48..de6ad39 100644 --- a/src/main/java/com/dsic/gj_erp/controller/zyjh/dto/PgDto.java +++ b/src/main/java/com/dsic/gj_erp/controller/zyjh/dto/PgDto.java @@ -1,6 +1,7 @@ package com.dsic.gj_erp.controller.zyjh.dto; import com.dsic.gj_erp.bean.jhgk.DmYdjh; +import com.dsic.gj_erp.bean.zyjh.YcldwInfo; import lombok.Getter; import lombok.Setter; @@ -13,4 +14,6 @@ public class PgDto { private String fieldry; private String zxZtName; private List list; + + private YcldwInfo ycldwInfo; } diff --git a/src/main/java/com/dsic/gj_erp/mapper/zyjh/YcldwInfoMapper.java b/src/main/java/com/dsic/gj_erp/mapper/zyjh/YcldwInfoMapper.java index ab8b518..2f3aa3b 100644 --- a/src/main/java/com/dsic/gj_erp/mapper/zyjh/YcldwInfoMapper.java +++ b/src/main/java/com/dsic/gj_erp/mapper/zyjh/YcldwInfoMapper.java @@ -6,4 +6,6 @@ import com.dsic.gj_erp.bean.zyjh.YcldwInfo; public interface YcldwInfoMapper extends BaseMapper { void daoduo(Integer id,int y); + + void pwfk(Integer ceng,Integer dwId); } diff --git a/src/main/java/com/dsic/gj_erp/service/zyjh/YcldwInfoService.java b/src/main/java/com/dsic/gj_erp/service/zyjh/YcldwInfoService.java index 42e6074..c3bdf7a 100644 --- a/src/main/java/com/dsic/gj_erp/service/zyjh/YcldwInfoService.java +++ b/src/main/java/com/dsic/gj_erp/service/zyjh/YcldwInfoService.java @@ -1,13 +1,13 @@ package com.dsic.gj_erp.service.zyjh; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.dsic.gj_erp.bean.zyjh.Ycldw; import com.dsic.gj_erp.bean.zyjh.YcldwInfo; import com.dsic.gj_erp.controller.zyjh.dto.ShangLiao; import com.dsic.gj_erp.mapper.zyjh.YcldwInfoMapper; -import com.dsic.gj_erp.mapper.zyjh.YcldwMapper; import org.springframework.stereotype.Service; +import javax.transaction.Transactional; + @Service public class YcldwInfoService extends ServiceImpl { @@ -20,4 +20,10 @@ public class YcldwInfoService extends ServiceImpl { public void daoduo(Integer id,int y){ baseMapper.daoduo(id,y); } + + @Transactional(rollbackOn = Exception.class) + public void updatePw(YcldwInfo info){ + this.removeById(info.getId()); + baseMapper.pwfk(info.getCeng(),info.getDwId()); + } } diff --git a/src/main/java/com/dsic/gj_erp/ws/WsHandler.java b/src/main/java/com/dsic/gj_erp/ws/WsHandler.java index e7d3c0d..8751cdc 100644 --- a/src/main/java/com/dsic/gj_erp/ws/WsHandler.java +++ b/src/main/java/com/dsic/gj_erp/ws/WsHandler.java @@ -41,4 +41,8 @@ public class WsHandler { public void sendSlComplete(JSONObject object) { socketIOServer.getBroadcastOperations().sendEvent("slComplete", object); } + + public void sendPwComplete(JSONObject object) { + socketIOServer.getBroadcastOperations().sendEvent("pwComplete", object); + } } diff --git a/src/main/resources/mappers/zyjh/YcldwInfoMapper.xml b/src/main/resources/mappers/zyjh/YcldwInfoMapper.xml index c0d5e8e..20a370a 100644 --- a/src/main/resources/mappers/zyjh/YcldwInfoMapper.xml +++ b/src/main/resources/mappers/zyjh/YcldwInfoMapper.xml @@ -5,4 +5,8 @@ update ycldw_info set ceng=ceng+#{y} where id=#{id} + + + update ycldw_info set ceng=ceng-1 where ceng>#{ceng} and dw_id=#{dwId} +