diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjh.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjh.java index 8d48ee5..cae9770 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjh.java +++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjh.java @@ -3,6 +3,7 @@ package com.dsic.gj_erp.bean.jhgk; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; +import com.dsic.gj_erp.bean.pgd.PgdTzjh; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -237,5 +238,9 @@ public class DmYdjh implements Serializable { private String jhlx="0"; private String jssjOld; + @TableField(exist = false) + private PgdTzjh pgdTzjh; + @TableField(exist = false) + private String color; } diff --git a/src/main/java/com/dsic/gj_erp/controller/jhgk/DmYdjhController.java b/src/main/java/com/dsic/gj_erp/controller/jhgk/DmYdjhController.java index bf017e6..1962351 100644 --- a/src/main/java/com/dsic/gj_erp/controller/jhgk/DmYdjhController.java +++ b/src/main/java/com/dsic/gj_erp/controller/jhgk/DmYdjhController.java @@ -2,6 +2,7 @@ package com.dsic.gj_erp.controller.jhgk; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -16,13 +17,19 @@ import com.dsic.gj_erp.service.jcsj.DmCzplpNewService; import com.dsic.gj_erp.service.jcsj.DmCzplpService; import com.dsic.gj_erp.service.jhgk.DmYdjhService; import com.dsic.gj_erp.service.kc.ImCkwpkwpService; +import org.apache.commons.lang3.StringUtils; +import org.apache.sis.internal.jaxb.metadata.EX_Extent; import org.mapstruct.factory.Mappers; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletRequest; +import java.text.SimpleDateFormat; +import java.time.LocalDate; import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; @@ -51,7 +58,8 @@ public class DmYdjhController { @RequestMapping("/getList") @AuthFunction - public ResultBean getList(@RequestBody Map map){ + public ResultBean getList(@RequestBody Map map ) { + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy/MM/dd"); List list= service.list(new QueryWrapper() .eq(StrUtil.isNotEmpty(map.get("dcCh")),"dc_ch",map.get("dcCh")) .eq(StrUtil.isNotEmpty(map.get("zt")),"zt",map.get("zt")) @@ -68,6 +76,7 @@ public class DmYdjhController { List czplpNewList = czplpNewService.list(Wrappers.lambdaQuery() .eq(DmCzplpNew::getDcCh, key) ); + val.forEach(item->{ Map itemMap = BeanUtil.beanToMap(item); resultMap.add(itemMap); @@ -79,8 +88,47 @@ public class DmYdjhController { } }); czplpNewList.forEach(czplpNew->{ - if (item.getDcCh().equals(czplpNew.getDcCh())&&item.getDcPl().equals(czplpNew.getDcPl())){ - itemMap.put("czplpNew",czplpNew); + if (item.getDcCh().equals(czplpNew.getDcCh())&&item.getDcPl().equals(czplpNew.getDcPl())) { + /// 判断颜色 + itemMap.put("czplpNew", czplpNew); +// if (StringUtils.isBlank(czplpNew.getXfqLqb())|| StringUtils.isBlank(item.getSlrq())) { +// // corlor red +// itemMap.put("color", "red"); +// } else { +// DateTime dateStr1 = DateUtil.parse(czplpNew.getXfqLqb(), "yyyy/MM/dd"); +// DateTime dateStr2 = DateUtil.parse(item.getSlrq(), "yyyy/MM/dd"); +// int result = DateUtil.compare(dateStr1, dateStr2); +// if (result > 0) { +// System.out.println(dateStr1 + " is after " + dateStr2); +// itemMap.put("color", "red"); +// } else if (result < 0) { +// System.out.println(dateStr1 + " is before " + dateStr2); +// +// } else { +// System.out.println(dateStr1 + " is equal to " + dateStr2); +// itemMap.put("color", "yellow"); +// } +// } +// if (StringUtils.isBlank(czplpNew.getXfqTlt())||StringUtils.isBlank(item.getHxrq())) { +// // corlor yellow +// itemMap.put("color", "red"); +// } else { +// DateTime dateStr1 = DateUtil.parse(czplpNew.getXfqTlt(), "yyyy/MM/dd"); +// DateTime dateStr2 = DateUtil.parse(item.getHxrq(), "yyyy/MM/dd"); +// int result = DateUtil.compare(dateStr1, dateStr2); +// if (result > 0) { +// System.out.println(dateStr1 + " is after " + dateStr2); +// itemMap.put("color", "red"); +// } else if (result < 0) { +// System.out.println(dateStr1 + " is before " + dateStr2); +// +// } else { +// System.out.println(dateStr1 + " is equal to " + dateStr2); +// itemMap.put("color", "yellow"); +// } +// } + }else { + // itemMap.put("color", "red"); } }); }); @@ -104,7 +152,8 @@ public class DmYdjhController { @RequestMapping("/tj") @AuthFunction public ResultBean tj(@RequestBody List list){ - List idList=list.stream().map(DmYdjh::getId).collect(Collectors.toList()); + List collect = list.stream().filter(fst -> StringUtils.isBlank(fst.getColor())).collect(Collectors.toList()); + List idList=collect.stream().map(DmYdjh::getId).collect(Collectors.toList()); if (idList.size()>1000){ AtomicInteger index=new AtomicInteger(idList.size()/1000+1); @@ -132,10 +181,13 @@ public class DmYdjhController { @RequestMapping("/xf") @AuthFunction - public ResultBean xf(@RequestBody List list){ - service.xf(list); + public ResultBean xf(@RequestBody List list, HttpServletRequest request){ + service.xf(list,request); return new ResultBean(); } + + + } 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 212c33d..112f245 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 @@ -20,11 +20,20 @@ import java.util.List; public interface DmYdjhMapper extends BaseMapper { List getSygdmx(String nextMonth); - List getTzjh(@Param("begin") String begin, @Param("end") String end); +// List getTzjh(@Param("begin") String begin, @Param("end") String end); + List getTzjh(@Param("list")List list,@Param("bzry") String bzry, @Param("bzrq") String bzrq); List getDhjh(@Param("begin") String begin, @Param("end") String end); - List getSljh(@Param("begin") String begin, @Param("end") String end); - List getPwjh(@Param("begin") String begin, @Param("end") String end); - List getQgjh(@Param("begin") String begin, @Param("end") String end); + List getSljh(@Param("list")List list,@Param("bzry") String bzry, @Param("bzrq") String bzrq); + List getPwjh(@Param("list")List list,@Param("bzry") String bzry, @Param("bzrq") String bzrq); + List getQgjh(@Param("list")List list,@Param("bzry") String bzry, @Param("bzrq") String bzrq); int xfbc(List ids); int tqlj(List ids); + + + + List getTzjh1(@Param("begin") String begin, @Param("end") String end); +// List getDhjh1(@Param("begin") String begin, @Param("end") String end); + List getSljh1(@Param("begin") String begin, @Param("end") String end); + List getPwjh1(@Param("begin") String begin, @Param("end") String end); + List getQgjh1(@Param("begin") String begin, @Param("end") String end); } diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/DmYdjhService.java b/src/main/java/com/dsic/gj_erp/service/jhgk/DmYdjhService.java index 6e8d7af..dde6522 100644 --- a/src/main/java/com/dsic/gj_erp/service/jhgk/DmYdjhService.java +++ b/src/main/java/com/dsic/gj_erp/service/jhgk/DmYdjhService.java @@ -6,6 +6,7 @@ import com.dsic.gj_erp.bean.jhgk.DmSygdMx; import com.dsic.gj_erp.bean.jhgk.DmYdjh; import org.springframework.transaction.annotation.Transactional; +import javax.servlet.http.HttpServletRequest; import java.util.List; import java.util.Map; @@ -25,6 +26,6 @@ public interface DmYdjhService extends IService { @Transactional Map hz2(String from, String to); - Map hz(List ydjhList); - void xf(List ydjhList); +// Map hz(List ydjhList); + void xf(List ydjhList, HttpServletRequest request); } diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmYdjhServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmYdjhServiceImpl.java index 0a849fe..a72d26d 100644 --- a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmYdjhServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmYdjhServiceImpl.java @@ -1,6 +1,7 @@ package com.dsic.gj_erp.service.jhgk.impl; +import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; @@ -14,12 +15,15 @@ import com.dsic.gj_erp.service.jhgk.DmQfxqService; import com.dsic.gj_erp.service.jhgk.DmYdjhService; import com.dsic.gj_erp.service.jiuzhou.SljhService; import com.dsic.gj_erp.service.pgd.*; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationEventPublisher; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.time.LocalDate; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -69,7 +73,7 @@ public class DmYdjhServiceImpl extends ServiceImpl impleme if (sygdmx.size() < 1) { System.out.println("请导入零件配套表信息！"); } - + // 判断要是不满足条件不可以提交 //TODO 重新排产 // pc(sygdMxList); @@ -89,111 +93,150 @@ public class DmYdjhServiceImpl extends ServiceImpl impleme // String end =DateUtil.format(DateUtil.endOfMonth(DateUtil.offsetMonth(DateUtil.date(),1)),"yyyy/MM/dd"); //图纸计划 - List tzjhList=tzjhService.list(new QueryWrapper().between("qgxqrq",begin,end).orderByAsc("czbh,pl,qgxqrq")); - if (tzjhList.size()<1){ - baseMapper.getTzjh(begin,end); - tzjhList=tzjhService.list(new QueryWrapper().between("qgxqrq",begin,end) - .orderByAsc("czbh,pl,qgxqrq") - ); - } + List tzjhList= baseMapper.getTzjh1(begin,end); + //订货清单 - List dhList=dhService.list(new QueryWrapper().between("slxqrq",begin,end).orderByAsc("czbh,slxqrq")); - if (dhList.size()<1){ - List dh= baseMapper.getDhjh(begin,end); - if (dh.size()>0){ + List dhList=baseMapper.getDhjh(begin,end); - dhService.saveBatch(dh); - dhList=dhService.list(new QueryWrapper().between("slxqrq",begin,end).orderByAsc("czbh,slxqrq")); - } - } //上料计划 - List slList=slService.list(new QueryWrapper().between("sljhrq",begin,end).orderByAsc("czbh,pl,sljhrq")); - if (slList.size()<1){ - baseMapper.getSljh(begin,end); - slList=slService.list(new QueryWrapper().between("sljhrq",begin,end).orderByAsc("czbh,pl,sljhrq")); - } + List slList= baseMapper.getSljh1(begin,end); + //抛丸计划 - List pwList=pwService.list(new QueryWrapper().between("pwjhrq",begin,end).orderByAsc("czbh,pl,pwjhrq")); - if (pwList.size()<1){ - baseMapper.getPwjh(begin,end); - pwList=pwService.list(new QueryWrapper().between("pwjhrq",begin,end).orderByAsc("czbh,pl,pwjhrq")); - } + List pwList= baseMapper.getPwjh1(begin,end); + //切割计划 - List qgList=qgService.list(new QueryWrapper().between("qgjhrq",begin,end).orderByAsc("czbh,pl,qgjhrq")); - if (qgList.size()<1){ - baseMapper.getQgjh(begin,end); - qgList=qgService.list(new QueryWrapper().between("qgjhrq",begin,end).orderByAsc("czbh,pl,qgjhrq")); - } - map.put("tzjhList",tzjhList); - map.put("dhList",dhList); - map.put("slList",slList); - map.put("pwList",pwList); - map.put("qgList",qgList); - return map; - } + List qgList= baseMapper.getQgjh1(begin,end); + List list= this.list(new QueryWrapper() - @Override - @Transactional - public Map hz(List ydjhList){ - Map map=new HashMap<>(); - //月度计划汇总 - //汇总时生成切割之前的派工单 状态为空 - String begin= DateUtil.format(DateUtil.nextMonth(),"yyyy/MM/01"); - String end =DateUtil.format(DateUtil.endOfMonth(DateUtil.offsetMonth(DateUtil.date(),1)),"yyyy/MM/dd"); - //图纸计划 + .eq("zt","0") + .ge( "jssj", DateUtil.beginOfMonth(DateUtil.parseDate(from)).toString("yyyy/MM/dd")) + .le( "jssj", DateUtil.endOfMonth(DateUtil.parseDate(to)).toString("yyyy/MM/dd")) + .orderByAsc("jssj,dc_ch,dc_pl,zl,lqlb") + ); + for(DmYdjh dmYdjh :list){ + PgdTzjh pgdTzjh = tzjhList.stream().filter(fst -> fst.getCzbh().equals(dmYdjh.getDcCh()) && fst.getPl().equals(dmYdjh.getDcPl()) + ).findFirst().orElse(null); + if(null!=pgdTzjh){ + dmYdjh.setPgdTzjh(pgdTzjh); + //领取表 早于上料日期 + // 套料图早于划线日期 + if(StringUtils.isBlank(pgdTzjh.getLqbxfrq())||StringUtils.isBlank(dmYdjh.getSlrq()) ){ + // corlor red + dmYdjh.setColor("red"); + }else{ - List tzjhList=tzjhService.list(new QueryWrapper().between("qgxqrq",begin,end).orderByAsc("czbh,pl,qgxqrq")); - if (tzjhList.size()<1){ - baseMapper.getTzjh(begin,end); - tzjhList=tzjhService.list(new QueryWrapper().between("qgxqrq",begin,end) - .orderByAsc("czbh,pl,qgxqrq") - ); - } - //订货清单 - List dhList=dhService.list(new QueryWrapper().between("slxqrq",begin,end).orderByAsc("czbh,slxqrq")); - if (dhList.size()<1){ - List dh= baseMapper.getDhjh(begin,end); - if (dh.size()>0){ + DateTime dateStr1 = DateUtil.parse(pgdTzjh.getLqbxfrq(), "yyyy/MM/dd"); + DateTime dateStr2 = DateUtil.parse(dmYdjh.getSlrq(), "yyyy/MM/dd"); + int result = DateUtil.compare(dateStr1, dateStr2); + if (result > 0) { + System.out.println(dateStr1 + " is after " + dateStr2); + dmYdjh.setColor("red"); + } else if (result < 0) { + System.out.println(dateStr1 + " is before " + dateStr2); + + } else { + System.out.println(dateStr1 + " is equal to " + dateStr2); + dmYdjh.setColor("yellow"); + } + } + if(StringUtils.isBlank(pgdTzjh.getTltxfrq())||StringUtils.isBlank(dmYdjh.getHxrq()) ){ + // corlor yellow + dmYdjh.setColor("red"); + }else{ - dhService.saveBatch(dh); - dhList=dhService.list(new QueryWrapper().between("slxqrq",begin,end).orderByAsc("czbh,slxqrq")); + + DateTime dateStr1 = DateUtil.parse(pgdTzjh.getTltxfrq(), "yyyy/MM/dd"); + DateTime dateStr2 = DateUtil.parse(dmYdjh.getHxrq(), "yyyy/MM/dd"); + int result = DateUtil.compare(dateStr1, dateStr2); + if (result > 0) { + System.out.println(dateStr1 + " is after " + dateStr2); + dmYdjh.setColor("red"); + } else if (result < 0) { + System.out.println(dateStr1 + " is before " + dateStr2); + + } else { + System.out.println(dateStr1 + " is equal to " + dateStr2); + dmYdjh.setColor("yellow"); + } + } + }else { + dmYdjh.setColor("red"); } - } - //上料计划 - List slList=slService.list(new QueryWrapper().between("sljhrq",begin,end).orderByAsc("czbh,pl,sljhrq")); - if (slList.size()<1){ - baseMapper.getSljh(begin,end); - slList=slService.list(new QueryWrapper().between("sljhrq",begin,end).orderByAsc("czbh,pl,sljhrq")); - } - //抛丸计划 - List pwList=pwService.list(new QueryWrapper().between("pwjhrq",begin,end).orderByAsc("czbh,pl,pwjhrq")); - if (pwList.size()<1){ - baseMapper.getPwjh(begin,end); - pwList=pwService.list(new QueryWrapper().between("pwjhrq",begin,end).orderByAsc("czbh,pl,pwjhrq")); - } - //切割计划 - List qgList=qgService.list(new QueryWrapper().between("qgjhrq",begin,end).orderByAsc("czbh,pl,qgjhrq")); - if (qgList.size()<1){ - baseMapper.getQgjh(begin,end); - qgList=qgService.list(new QueryWrapper().between("qgjhrq",begin,end).orderByAsc("czbh,pl,qgjhrq")); + } map.put("tzjhList",tzjhList); map.put("dhList",dhList); map.put("slList",slList); map.put("pwList",pwList); map.put("qgList",qgList); + map.put("list",list); return map; } +// @Override +// @Transactional +// public Map hz(List ydjhList){ +// Map map=new HashMap<>(); +// //月度计划汇总 +// //汇总时生成切割之前的派工单 状态为空 +// String begin= DateUtil.format(DateUtil.nextMonth(),"yyyy/MM/01"); +// String end =DateUtil.format(DateUtil.endOfMonth(DateUtil.offsetMonth(DateUtil.date(),1)),"yyyy/MM/dd"); +// //图纸计划 +// +// List tzjhList=tzjhService.list(new QueryWrapper().between("qgxqrq",begin,end).orderByAsc("czbh,pl,qgxqrq")); +// if (tzjhList.size()<1){ +// baseMapper.getTzjh(begin,end); +// tzjhList=tzjhService.list(new QueryWrapper().between("qgxqrq",begin,end) +// .orderByAsc("czbh,pl,qgxqrq") +// ); +// } +// //订货清单 +// List dhList=dhService.list(new QueryWrapper().between("slxqrq",begin,end).orderByAsc("czbh,slxqrq")); +// if (dhList.size()<1){ +// List dh= baseMapper.getDhjh(begin,end); +// if (dh.size()>0){ +// +// dhService.saveBatch(dh); +// dhList=dhService.list(new QueryWrapper().between("slxqrq",begin,end).orderByAsc("czbh,slxqrq")); +// } +// } +// //上料计划 +// List slList=slService.list(new QueryWrapper().between("sljhrq",begin,end).orderByAsc("czbh,pl,sljhrq")); +// if (slList.size()<1){ +// baseMapper.getSljh(begin,end); +// slList=slService.list(new QueryWrapper().between("sljhrq",begin,end).orderByAsc("czbh,pl,sljhrq")); +// } +// //抛丸计划 +// +// List pwList=pwService.list(new QueryWrapper().between("pwjhrq",begin,end).orderByAsc("czbh,pl,pwjhrq")); +// if (pwList.size()<1){ +// baseMapper.getPwjh(begin,end); +// pwList=pwService.list(new QueryWrapper().between("pwjhrq",begin,end).orderByAsc("czbh,pl,pwjhrq")); +// } +// //切割计划 +// List qgList=qgService.list(new QueryWrapper().between("qgjhrq",begin,end).orderByAsc("czbh,pl,qgjhrq")); +// if (qgList.size()<1){ +// baseMapper.getQgjh(begin,end); +// qgList=qgService.list(new QueryWrapper().between("qgjhrq",begin,end).orderByAsc("czbh,pl,qgjhrq")); +// } +// map.put("tzjhList",tzjhList); +// map.put("dhList",dhList); +// map.put("slList",slList); +// map.put("pwList",pwList); +// map.put("qgList",qgList); +// return map; +// } + @Resource private ApplicationEventPublisher publisher; //下发 派工单状态改为编制 生成零件信息 @Override - public void xf(List ydjhList) { - + public void xf(List ydjhList, HttpServletRequest request) { + String bzry= (String) request.getAttribute("yhms"); + String bzrq= DateUtil.format(DateUtil.date(), "yyyy/MM/dd"); //修改状态 List idList = ydjhList.stream().map(DmYdjh::getId).collect(Collectors.toList()); @@ -203,7 +246,14 @@ public class DmYdjhServiceImpl extends ServiceImpl impleme this.update(new UpdateWrapper().set("zt", "2") .in("id", list) ); - baseMapper.xfbc(list); + + // 生成 数据 +// baseMapper.xfbc(list); + baseMapper.getTzjh(list,bzry,bzrq); + baseMapper.getSljh(list,bzry,bzrq); + baseMapper.getPwjh(list,bzry,bzrq); + baseMapper.getQgjh(list,bzry,bzrq); + baseMapper.tqlj(list); do { int i = index.decrementAndGet(); @@ -211,7 +261,12 @@ public class DmYdjhServiceImpl extends ServiceImpl impleme this.update(new UpdateWrapper().set("zt", "2") .in("id", list1) ); - baseMapper.xfbc(list1); +// baseMapper.xfbc(list1); + baseMapper.getTzjh(list1,bzry,bzrq); + baseMapper.getSljh(list1,bzry,bzrq); + baseMapper.getPwjh(list1,bzry,bzrq); + baseMapper.getQgjh(list1,bzry,bzrq); + baseMapper.tqlj(list1); }while (index.get()>1); @@ -219,9 +274,16 @@ public class DmYdjhServiceImpl extends ServiceImpl impleme this.update(new UpdateWrapper().set("zt", "2") .in("id", idList) ); - //修改汇总状态 改为 编制 - baseMapper.xfbc(idList); - //生成对应零件信息 bom->tzjhLj +// //修改汇总状态 改为 编制 +// baseMapper.xfbc(idList); +// //生成对应零件信息 bom->tzjhLj +// baseMapper.tqlj(idList); +// baseMapper.xfbc(idList); + baseMapper.getTzjh(idList,bzry,bzrq); + baseMapper.getSljh(idList,bzry,bzrq); + baseMapper.getPwjh(idList,bzry,bzrq); + baseMapper.getQgjh(idList,bzry,bzrq); + baseMapper.tqlj(idList); } diff --git a/src/main/resources/mappers/jhgk/DmYdjhMapper.xml b/src/main/resources/mappers/jhgk/DmYdjhMapper.xml index 9a13b35..965de1e 100644 --- a/src/main/resources/mappers/jhgk/DmYdjhMapper.xml +++ b/src/main/resources/mappers/jhgk/DmYdjhMapper.xml @@ -157,7 +157,56 @@ on dm_sygd_mx.dc_ch=t.DC_CH and dm_sygd_mx.dc_pl=t.DC_PL and dm_sygd_mx.tzbh=t.TZBH order BY t.xqsj,t.DC_CH,t.DC_PL - INSERT into pgd_tzjh( tzzt, zt, @@ -171,8 +220,47 @@ qgxqrq, qfxqrqxz, qfxqrqdz, - id + id,bzry,bzrq ) + SELECT + '00' as tzzt, + '01' as zt, + dm_ydjh.dc_ch as czbh, + dm_ydjh.dc_pl as pl, + dm_ydjh.dc_fd as fd, + dm_czplp_new.xfq_lqb as lqbxfrq, + dm_czplp_new.jsq_lqb as lqbjsrq, + dm_czplp_new.xfq_tlt as tltxfrq, + dm_czplp_new.jsq_tlt as tltjsrq, + MIN(dm_ydjh.qgrq) as qgxqrq, + MIN(dm_ydjh.jssj) as qfxqrqxz, + MIN(dm_ydjh.gjjs_dz) as qfxqrqdz, + REPLACE(CAST(CAST(NEWID()AS BINARY(10)) + CAST(GETDATE() AS BINARY(6)) AS UNIQUEIDENTIFIER),'-','') + as id, + #{bzry}, + #{bzrq} + from + dm_ydjh + LEFT JOIN dm_czplp_new + on + dm_ydjh.dc_ch=dm_czplp_new.DC_CH and + dm_ydjh.dc_pl=dm_czplp_new.DC_pl + WHERE + dm_ydjh.id in + + #{id} + + GROUP BY + dm_ydjh.dc_ch, + dm_ydjh.dc_pl, + dm_ydjh.dc_fd, + dm_czplp_new.xfq_lqb, + dm_czplp_new.jsq_lqb, + dm_czplp_new.xfq_tlt, + dm_czplp_new.jsq_tlt + + + + + + + @@ -380,7 +533,9 @@ qgcd, hxkccd, qgkccd, - zt + zt, + bzry, + bzrq ) SELECT REPLACE(CAST(CAST(NEWID()AS BINARY(10)) + CAST(GETDATE() AS BINARY(6)) AS UNIQUEIDENTIFIER),'-','')as id, @@ -402,9 +557,40 @@ qgcd, hxkc_cd as hxkccd, qgkc_cd as qgkccd, - '00' as zt + '01' as zt, + #{bzry}, + #{bzrq} + from dm_ydjh + where dm_ydjh.id in + + #{id} + + + + update pgd_tzjh