xn

src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmYdjhServiceImpl.java

@@ -79,10 +79,10 @@ public class DmYdjhServiceImpl extends ServiceImpl<DmYdjhMapper, DmYdjh> impleme
         Map<String,Object> map=new HashMap<>();
         //月度计划汇总
         //汇总时生成切割之前的派工单 状态为空
-        String begin= DateUtil.format(DateUtil.nextMonth(),"yyyy/MM/01");
+//        String begin= DateUtil.format(DateUtil.nextMonth(),"yyyy/MM/01");
-        String end =DateUtil.format(DateUtil.endOfMonth(DateUtil.offsetMonth(DateUtil.date(),1)),"yyyy/MM/dd");
+//        String end =DateUtil.format(DateUtil.endOfMonth(DateUtil.offsetMonth(DateUtil.date(),1)),"yyyy/MM/dd");
-//        String begin="2023/08/01";
+        String begin="2023/08/01";
-//        String end ="2023/08/31";
+        String end ="2023/08/31";
         //图纸计划
 
         List<PgdTzjh> tzjhList=tzjhService.list(new QueryWrapper<PgdTzjh>().between("qgxqrq",begin,end).orderByAsc("czbh,pl,qgxqrq"));
@@ -95,9 +95,13 @@ public class DmYdjhServiceImpl extends ServiceImpl<DmYdjhMapper, DmYdjh> impleme
         //订货清单
         List<PgdDh> dhList=dhService.list(new QueryWrapper<PgdDh>().between("slxqrq",begin,end).orderByAsc("czbh,slxqrq"));
         if (dhList.size()<1){
-            baseMapper.getDhjh(begin,end);
+            List<PgdDh> dh= baseMapper.getDhjh(begin,end);
+            if (dh.size()>0){
+                dhService.saveBatch(dh);
                 dhList=dhService.list(new QueryWrapper<PgdDh>().between("slxqrq",begin,end).orderByAsc("czbh,slxqrq"));
             }
+
+        }
         //上料计划
         List<PgdSljh> slList=slService.list(new QueryWrapper<PgdSljh>().between("sljhrq",begin,end).orderByAsc("czbh,pl,sljhrq"));
         if (slList.size()<1){
@@ -127,15 +131,20 @@ public class DmYdjhServiceImpl extends ServiceImpl<DmYdjhMapper, DmYdjh> impleme
 
     //下发 派工单状态改为编制 生成零件信息
     @Override
+    @Transactional
     public void xf(List<DmYdjh> ydjhList){
 
         //修改状态
         List<String> idList=ydjhList.stream().map(DmYdjh::getId).collect(Collectors.toList());
+        //修改汇总状态 改为 编制
+        int num= baseMapper.xfbc(idList);
+        if(num<1){
+          throw new RuntimeException("请先汇总，后下发！");
+        }
         this.update(new UpdateWrapper<DmYdjh>().set("zt","2")
                 .in( "id",idList)
         );
-        //修改汇总状态 改为 编制
+
-        baseMapper.xfbc(idList);
         //生成对应零件信息 bom->tzjhLj
         baseMapper.tqlj(idList);
     }

src/main/resources/mappers/jhgk/DmYdjhMapper.xml

@@ -203,40 +203,24 @@
             dm_czplp_new.xfq_tlt,
             dm_czplp_new.jsq_tlt
     </select>
+
     <select id="getDhjh" resultType="com.dsic.gj_erp.bean.pgd.PgdDh">
-        insert into pgd_dh
-        (id,
-         czbh,
-         pl,
-         dhqdh,
-         wpcz,
-         slxqrq,
-         qfxqrqxz,
-         qfxqrqdz,
-         hth,
-         xhth,
-         dhsl,
-         hd,
-         kd,
-         cd,
-         xqsl)
         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_ydjh.dhqd as dhqdh,
+        dhxx.RKXH         as wpcz,
+        dm_ydjh.slrq      as slxqrq,
         dm_ydjh.jssj      as qfxqrqxz,
         dm_ydjh.gjjs_dz   as qfxqrqdz,
-               dm_ydjh.slrq      as slxqrq,
         dhxx.ddmc         as hth,
         dhxx.dc_ch        as xhth,
-               dhxx.DHSL         as xqsl,
         dhxx.HDSL         as dhsl,
         dhxx.WPHD         as hd,
         dhxx.WPCD         as cd,
         dhxx.WPKD         as kd,
-               dhxx.RKXH         as wpcz
+        dhxx.DHSL         as xqsl
-        from dm_ydjh
+        from dm_ydjh ,
-                 LEFT JOIN
         (select MS_DDJBP.CGFLM,
         MS_DDJBP.DDH,
         MS_DDJBP.ddmc       as ddmc,
@@ -261,11 +245,12 @@
         and im_crklsz.HDLX  <![CDATA[ <> ]]> '99'
         GROUP BY MS_DDJBP.CGFLM, MS_DDJBP.DDH, MS_DDJBP.ddmc, MS_DDMXP.dc_ch, MS_DDMXP.WPHD, MS_DDMXP.WPCD,
         MS_DDMXP.WPKD, MS_DDMXP.RKXH, MS_DDJBP.dhqdh) dhxx
-             on dhxx.dhqdh = dm_ydjh.dhqd
+        where  dhxx.dhqdh = dm_ydjh.dhqd and dhxx.dhqdh is not null and
-        where dm_ydjh.slrq BETWEEN #{begin} and #{end}
+        dm_ydjh.slrq BETWEEN #{begin} and #{end}
         ORDER BY dm_ydjh.dc_ch,
         dm_ydjh.dc_pl
     </select>
+
     <select id="getSljh" resultType="com.dsic.gj_erp.bean.pgd.PgdSljh">
         insert into pgd_sljh
         (