1.取消月度计划审核生成工单号

2.优化处理结果显示
3.修复划线、切割报工未根据作业区获取数据的bug
4.增加作业计划作业区调整功能
5.调整上料摆放区域可拖动

src/main/java/com/dsic/gj_erp/bean/czzj/MpDhsj.java

@@ -0,0 +1,53 @@
+package com.dsic.gj_erp.bean.czzj;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class MpDhsj {
+
+    private String dhh;
+
+    private String wph;
+
+    private String wpjb;
+
+    private String gzlx;
+
+    private String gzbm;
+
+    private String dhsl;
+
+    private String cpxql;
+
+    private String gysbh;
+
+    private String gylb;
+
+    private String zt;
+
+    private String sysl;
+
+    private String xdtz;
+
+    private String dcCh;
+
+    private String dcPl;
+
+    private String dcFd;//船号+分段号
+
+    private String dcTh;
+
+    private String dcZl;
+
+    private String dcLph;
+
+    private String dcTpbh;
+
+    private String dcTpmc;
+
+    private String hxfl;
+
+    private String dhsl1;
+}

src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjh.java

@@ -374,6 +374,7 @@ public class DmYdjh implements Serializable {
     private String zyq1;
     private String ykw;
     private String kwmc;
+    private String zylx;//流向,对应字典编码类别:zylx
 
 
     @TableField(exist = false)

src/main/java/com/dsic/gj_erp/bean/zyjh/Ycldw.java

@@ -20,10 +20,18 @@ public class Ycldw {
     private String name;
     private DwTypeEnum type;
     private String tzbh;
+    private String kw;
 
     @TableField(exist = false)
     private List<YcldwInfo> list;
 
+    public void setTypeForYcl(){
+        this.type=DwTypeEnum.YCL;
+    }
+
+    public static DwTypeEnum getTypeForYcl(){
+        return DwTypeEnum.YCL;
+    }
 
     public enum DwTypeEnum{
         YCL,//预处理垛位

src/main/java/com/dsic/gj_erp/config/JapConfig.java

@@ -95,7 +95,7 @@ public class JapConfig {
         dataSource.setIdleTimeout(60000);
         dataSource.setMaximumPoolSize(200);
         dataSource.setLeakDetectionThreshold(60000);
-        dataSource.setMinimumIdle(40);
+        dataSource.setMinimumIdle(20);
         dataSource.setMaxLifetime(1800000);
         dsInitializer.setDataSource(dataSource);
         ResourceDatabasePopulator dbPopulator = new ResourceDatabasePopulator();

src/main/java/com/dsic/gj_erp/controller/jhgk/DmYdjhController.java

@@ -57,6 +57,12 @@ public class DmYdjhController {
     @Autowired
     private DmYdjhMapper dmYdjhMapper;
 
+    @PostMapping("editZyq")
+    public ResultBean<?> editZyq(@RequestBody DmYdjh ydjh){
+        service.updateById(ydjh);
+        return new ResultBean<>();
+    }
+
     @PostMapping("save")
     public ResultBean<?> save(@RequestBody List<DmYdjh> list){
         service.updateBatchById(list);

src/main/java/com/dsic/gj_erp/controller/zyjh/YcldwController.java

@@ -0,0 +1,56 @@
+package com.dsic.gj_erp.controller.zyjh;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.dsic.gj_erp.bean.ResultBean;
+import com.dsic.gj_erp.bean.zyjh.Ycldw;
+import com.dsic.gj_erp.service.zyjh.YcldwService;
+import lombok.AllArgsConstructor;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@RestController
+@RequestMapping("ycldw")
+@AllArgsConstructor
+public class YcldwController {
+
+    private final YcldwService service;
+
+    @PostMapping("list")
+    public ResultBean<?> list(@RequestBody Ycldw ycldw) {
+        return new ResultBean<>(
+            service.list(Wrappers.<Ycldw>lambdaQuery()
+                .eq(Ycldw::getType,Ycldw.getTypeForYcl())
+                .eq(StrUtil.isNotEmpty(ycldw.getKw()),Ycldw::getKw,ycldw.getKw())
+        ));
+    }
+
+    @PostMapping("submit")
+    @Transactional(rollbackFor = Exception.class)
+    public ResultBean<?> edit(@RequestBody Map<String,List<Ycldw>> map) {
+        if (map.get("add")!=null){
+            map.get("add").forEach(item->{
+                item.setTypeForYcl();
+                service.save(item);
+            });
+        }
+
+        if (map.get("edit")!=null){
+            service.updateBatchById(map.get("edit"));
+        }
+
+        if (map.get("remove")!=null){
+            List<Integer> remove = map.get("remove").stream().map(Ycldw::getId).collect(Collectors.toList());
+            service.removeByIds(remove);
+        }
+
+        return new ResultBean<>();
+    }
+}

src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java

@@ -9,15 +9,19 @@ 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;
 import com.dsic.gj_erp.controller.zyjh.dto.*;
 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;
@@ -51,9 +55,10 @@ public class ZyjhController {
 
     private final WebSocketService webSocketService;
 
-
     private final ImCkwpkwpService imCkwpkwpService;
 
+    private final MpDhsjServcie mpDhsjServcie;
+
     /**
      * 抛丸导入
      */
@@ -156,8 +161,8 @@ public class ZyjhController {
      * 根据状态或班组长,获取作业计划,用于报工
      */
     @GetMapping("getYdjhByZtOrForeman")
-    public ResultBean<?> getYdjhByZtOrForeman(Integer zt,String foreman){
-        List<DmYdjh> list = zyjhService.getYdjhByZtOrForeman(zt, foreman);
+    public ResultBean<?> getYdjhByZtOrForeman(Integer zt,String foreman,String zyq){
+        List<DmYdjh> list = zyjhService.getYdjhByZtOrForeman(zt, foreman,zyq);
         return new ResultBean<>(list);
     }
 
@@ -245,21 +250,34 @@ public class ZyjhController {
                     wsHandler.sendPwComplete((JSONObject) JSONObject.toJSON(info));
                 }
             }
+
             if ("HXFK".equals(dto.getZxZtName())){
                 if (ObjUtil.isNotEmpty(info)&&info.getId()!=null){
                     ycldwInfoService.updatePw(dto.getYcldwInfo());
                     wsHandler.sendHXComplete((JSONObject) JSONObject.toJSON(dto.getYcldwInfo()));
                 }
             }
+
             if ("QGFK".equals(dto.getZxZtName())){
                 //无需划线,从理料间获取时才更新垛位信息
                 if (ObjUtil.isNotEmpty(info)&&info.getId()!=null){
                     if ("42".equals(dto.getZt())){
                         ycldwInfoService.updatePw(dto.getYcldwInfo());
                     }
+
+                    //更新质量的炉批号
+                    List<MpDhsj> 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()));
                 }
+
             }
             zyjhService.updateBatchById(list);
 

src/main/java/com/dsic/gj_erp/mapper/czzj/MpDhsjMapper.java

@@ -0,0 +1,9 @@
+package com.dsic.gj_erp.mapper.czzj;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsic.gj_erp.bean.czzj.MpDhsj;
+import org.mapstruct.Mapper;
+
+@Mapper
+public interface MpDhsjMapper extends BaseMapper<MpDhsj> {
+}

src/main/java/com/dsic/gj_erp/service/czzj/MpDhsjServcie.java

@@ -0,0 +1,10 @@
+package com.dsic.gj_erp.service.czzj;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsic.gj_erp.bean.czzj.MpDhsj;
+import com.dsic.gj_erp.mapper.czzj.MpDhsjMapper;
+import org.springframework.stereotype.Service;
+
+@Service
+public class MpDhsjServcie extends ServiceImpl<MpDhsjMapper, MpDhsj> {
+}

src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java

@@ -36,9 +36,11 @@ public class ZyjhService extends ServiceImpl<DmYdjhMapper,DmYdjh> {
     private final DmCbxxpService dmCbxxpService;
     private final RedisTemplate<String,Object> redisTemplate;
 
-    public List<DmYdjh> getYdjhByZtOrForeman(Integer zt,String foreman){
+    public List<DmYdjh> getYdjhByZtOrForeman(Integer zt,String foreman,String zyq){
         QueryWrapper<DmYdjh> wrapper = new QueryWrapper<DmYdjh>()
-                .ge("zt",11).ge(ObjUtil.isNotEmpty(zt),"zt",zt);
+                .ge("zt",11)
+                .ge(ObjUtil.isNotEmpty(zt),"zt",zt)
+                .eq(StrUtil.isNotEmpty(zyq),"zyq1",zyq);
 
         switch (zt){
             case 31:

src/main/resources/mappers/czzj/YcldwMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dsic.gj_erp.mapper.czzj.MpDhsjMapper">
+
+</mapper>