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 a4731a4..6696f45 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 @@ -9,10 +9,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.dsic.gj_erp.annotation.AuthFunction; import com.dsic.gj_erp.bean.ResultBean; -import com.dsic.gj_erp.bean.czzj.MpDhsj; import com.dsic.gj_erp.bean.jhgk.DmYdjh; import com.dsic.gj_erp.bean.kc.ImCkwpkwp; -import com.dsic.gj_erp.bean.pbsc.MpYlxxp; import com.dsic.gj_erp.bean.zyjh.PwExcel; import com.dsic.gj_erp.bean.zyjh.Ycldw; import com.dsic.gj_erp.bean.zyjh.YcldwInfo; @@ -21,7 +19,6 @@ import com.dsic.gj_erp.exception.ServiceException; import com.dsic.gj_erp.listeners.ExcelPwListener; import com.dsic.gj_erp.service.czzj.MpDhsjServcie; import com.dsic.gj_erp.service.kc.ImCkwpkwpService; -import com.dsic.gj_erp.service.pgsc.MpYlxxpService; import com.dsic.gj_erp.service.zyjh.YcldwInfoService; import com.dsic.gj_erp.service.zyjh.YcldwService; import com.dsic.gj_erp.service.zyjh.ZyjhService; @@ -265,14 +262,17 @@ public class ZyjhController { ycldwInfoService.updatePw(dto.getYcldwInfo()); } - //更新质量的炉批号 - List collect=new ArrayList<>(); - list.forEach(item -> { - MpDhsj mpDhsj = new MpDhsj(); + //生成零件信息 + list.forEach(item-> zyjhService.createLj(item.getDcCh(),item.getDcPl(),item.getTzbh())); - collect.add(mpDhsj); - }); - mpDhsjServcie.saveBatch(collect); + //生成质量信息 +// List collect=new ArrayList<>(); +// list.forEach(item -> { +// MpDhsj mpDhsj = new MpDhsj(); +// +// collect.add(mpDhsj); +// }); +// mpDhsjServcie.saveBatch(collect); wsHandler.sendHXComplete((JSONObject) JSONObject.toJSON(dto.getYcldwInfo())); wsHandler.sendQGComplete((JSONObject) JSONObject.toJSON(dto.getYcldwInfo())); @@ -433,7 +433,8 @@ public class ZyjhController { .eq(StrUtil.isNotEmpty(search.getDcch()),DmYdjh::getDcCh, search.getDcch()) .eq(StrUtil.isNotEmpty(search.getDcPl()),DmYdjh::getDcPl, search.getDcPl()) .eq(StrUtil.isNotEmpty(search.getKw()),DmYdjh::getKw, search.getKw()) - .orderByDesc(DmYdjh::getDjh) + .eq(StrUtil.isNotEmpty(search.getZylx()),DmYdjh::getZylx, search.getZylx()) + .orderByAsc(DmYdjh::getDjh) ); return new ResultBean<>(list); diff --git a/src/main/java/com/dsic/gj_erp/controller/zyjh/dto/SljhSearch.java b/src/main/java/com/dsic/gj_erp/controller/zyjh/dto/SljhSearch.java index 17ad843..fceb5a3 100644 --- a/src/main/java/com/dsic/gj_erp/controller/zyjh/dto/SljhSearch.java +++ b/src/main/java/com/dsic/gj_erp/controller/zyjh/dto/SljhSearch.java @@ -12,4 +12,5 @@ public class SljhSearch { private String sljhrq; private String sllsh; private String zt="2"; + private String zylx; } 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 115aa8a..9abeaee 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 @@ -37,7 +37,7 @@ public interface DmYdjhMapper extends BaseMapper { int xfbc(List ids); int tqlj(List ids); - + int tqljByInfo(String dcCh,String dcPl,String tzbh); List getTzjh1(@Param("begin") String begin, @Param("end") String end); 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 2dcb21f..3d95e1d 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 @@ -16,14 +16,13 @@ import com.dsic.gj_erp.controller.zyjh.dto.ShangLiao; import com.dsic.gj_erp.mapper.jhgk.DmYdjhMapper; import com.dsic.gj_erp.service.jcsj.DmBzryService; import com.dsic.gj_erp.service.jcsj.DmCbxxpService; +import com.dsic.gj_erp.service.jhgk.DmYdjhLjService; import com.google.common.collect.ImmutableMap; import lombok.AllArgsConstructor; -import lombok.NonNull; -import org.springframework.cache.annotation.Cacheable; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -35,6 +34,12 @@ public class ZyjhService extends ServiceImpl { private final DmBzryService bzryService; private final DmCbxxpService dmCbxxpService; private final RedisTemplate redisTemplate; + private final DmYdjhLjService ljService; + + @Transactional(rollbackFor = Exception.class) + public void createLj(String dcCh, String dcPl, String tzbh){ + baseMapper.tqljByInfo(dcCh,dcPl,tzbh); + } public List getYdjhByZtOrForeman(Integer zt,String foreman,String zyq){ QueryWrapper wrapper = new QueryWrapper() diff --git a/src/main/resources/mappers/jhgk/DmYdjhMapper.xml b/src/main/resources/mappers/jhgk/DmYdjhMapper.xml index 17b32d5..9e45dcd 100644 --- a/src/main/resources/mappers/jhgk/DmYdjhMapper.xml +++ b/src/main/resources/mappers/jhgk/DmYdjhMapper.xml @@ -824,6 +824,79 @@ + + insert into dm_ydjh_lj ( + id, + czbh, + pl, + fd, + kw, + zl, + tlth, + ptblx, + ljbh, + ljmc, + ljgg, + ljcz, + wpfl, + jldw, + sl, + qfxqrqxz, + qfxqrqdz, + gylx, + pklx, + pkcd, + pkbs, + dmbs, + dmcd, + qbs, + qjg_zt, + pk_zt, + dm_zt,dmjhrq,pkjhrq,qjgjhrq,ppzt + ) + SELECT + REPLACE(CAST(CAST(NEWID()AS BINARY(10)) + CAST(GETDATE() AS BINARY(6)) AS UNIQUEIDENTIFIER),'-','') as id, + dm_ydjh.dc_ch as czbh, + dm_ydjh.dc_pl as pl, + dm_bom.fd as fd, + dm_ydjh.kw as kw, + dm_bom.zl as zl, + dm_bom.tzbh as tlth, + '' as ptblx, + dm_bom.ljbh as ljbh, + '' as ljmc, + dm_bom.wpgg as ljgg, + dm_bom.wpcz as ljcz, + '' as wpfl, + '' as jldw, + dm_bom.ljsl as sl, + dm_qfxq.xzglxq as qfxqrqxz, + dm_qfxq.dzglxq as qfxqrqdz, + '' as gylx, + dm_bom.pklx as pklx, + dm_bom.pkcd as pkcd, + case when isnull(dm_ydjh.pkrq,'')<>'' + then 'Y' + else '' end , + case when isnull(dm_ydjh.dmrq,'')<>'' + then 'Y' + else '' end , + dm_bom.dmcd as dmcd, + case when isnull(dm_ydjh.qjgrq,'')<>'' + then 'Y' + else '' end, + '01', + '01','01',dm_ydjh.dmrq dmjhrq,dm_ydjh.pkrq pkjhrq,dm_ydjh.qjgrq qjgjhrq,'01' + 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 + and dm_ydjh.dc_pl=dm_bom.pl + and dm_ydjh.tzbh=dm_bom.tzbh + and dm_ydjh.dc_fd=dm_bom.fd + and dm_ydjh.dc_ch=#{dcCh} and dm_ydjh.dc_pl=#{dcPl} and dm_ydjh.tzbh=#{tzbh} + +