1.预配盘

2.调整作业计划查询明细标签内的表格列显示内容

src/main/java/com/dsic/gj_erp/Test.java

@@ -33,7 +33,7 @@ public class Test {
 //        MatrixToImageWriter.
 
         TimeInterval timer = DateUtil.timer();
-        String pdfFilePath = "E:\\T300K-130_1_20250106\\PDF\\B001HC103HN数控套料图.pdf"; // PDF文件路径
+        String pdfFilePath = "E:\\B058HC104HN第058批量龙门套料图2023-07-20.pdf"; // PDF文件路径
         PDDocument document = PDDocument.load(new File(pdfFilePath));
 //        PDFTextStripper stripper = new PDFTextStripper();
 //        String text = stripper.getText(document);

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

@@ -1,13 +1,16 @@
 package com.dsic.gj_erp.bean.zyjh;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.dsic.gj_erp.bean.jhgk.DmYdjh;
 import lombok.Getter;
 import lombok.Setter;
 
 @Getter
 @Setter
-public class DmYppyz {
+public class DmYppyz extends Model<DmYppyz> {
 
     @TableId(type = IdType.AUTO)
     public Integer id;
@@ -36,6 +39,13 @@ public class DmYppyz {
 
     private StatusEnum status=StatusEnum.未设置垛位;
 
+    public static DmYppyz of(DmYdjh ydjh){
+
+        DmYppyz dmYppyz = new DmYppyz();
+        BeanUtil.copyProperties(ydjh,dmYppyz);
+        return dmYppyz;
+    }
+
     private enum StatusEnum{
         未设置垛位,设置垛位,已配送
     }

src/main/java/com/dsic/gj_erp/controller/pgd/PgdTzjhController.java

@@ -135,11 +135,11 @@ public class PgdTzjhController {
         List<EmSbjgry> gxry = emSbjgryService.list();
         List<Map> bmbm = syService.em_sbjbb_ZM("bmbm");
         // 多为
-        List<DmDwxxp> dwxxs = dwxxpService.list();
+//        List<DmDwxxp> dwxxs = dwxxpService.list();
         List<DmDwxxp> qys = dwxxpService.list(new QueryWrapper<DmDwxxp>().select("DISTINCT qy as  qy "));
         returnMap.put("qys", qys);
-        returnMap.put("dwxxs", dwxxs);
+//        returnMap.put("dwxxs", dwxxs);
-        returnMap.put("dwxxs1", dwxxs);
+//        returnMap.put("dwxxs1", dwxxs);
 
 
         List<Ycldw> ycldws = ycldwService.ycldwList("ycl","BF");

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

@@ -3,9 +3,11 @@ 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.jhgk.DmYdjh;
 import com.dsic.gj_erp.bean.jhgk.DmYdjhLj;
 import com.dsic.gj_erp.service.jcsj.impl.DmDwxxpService;
 import com.dsic.gj_erp.service.jhgk.DmYdjhLjService;
+import com.dsic.gj_erp.service.jhgk.DmYdjhService;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
@@ -17,6 +19,7 @@ import java.util.List;
 public class GetXXXController {
 
     private final DmDwxxpService dmDwxxpService;
+    private final DmYdjhService dmYdjhService;
     private final DmYdjhLjService ydjhLjService;
 
     @PostMapping("getYdjhlj")
@@ -28,6 +31,12 @@ public class GetXXXController {
         return new ResultBean<>(list);
     }
 
+    @GetMapping("tq")
+    public ResultBean<?> tqFromYdjh(){
+
+        return new ResultBean<>(dmDwxxpService.getDwxxForSelect());
+    }
+
     @GetMapping("getBFangDwxx")
     public ResultBean<?> getBFangDwxx(){
         return new ResultBean<>(dmDwxxpService.getDwxxForSelect());

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

@@ -13,6 +13,7 @@ import com.dsic.gj_erp.bean.czzj.MpDhsj;
 import com.dsic.gj_erp.bean.jhgk.DmYdjh;
 import com.dsic.gj_erp.bean.jhgk.DmYdjhLj;
 import com.dsic.gj_erp.bean.kc.ImCkwpkwp;
+import com.dsic.gj_erp.bean.zyjh.DmYppyz;
 import com.dsic.gj_erp.bean.zyjh.PwExcel;
 import com.dsic.gj_erp.bean.zyjh.Ycldw;
 import com.dsic.gj_erp.bean.zyjh.YcldwInfo;
@@ -297,8 +298,12 @@ public class ZyjhController {
                     wsHandler.sendQGComplete((JSONObject) JSONObject.toJSON(dto.getYcldwInfo()));
                 }
 
-                //生成零件信息
                 for (DmYdjh item : list) {
+                    //生成预配盘信息
+//                    DmYppyz dmYppyz = DmYppyz.of(item);
+//                    dmYppyz.insert();
+
+                    //生成零件信息
                     List<DmYdjhLj> ljList = zyjhService.createLj(item.getDcCh(), item.getDcPl(), item.getTzbh());
 
                     //兼容老系统回报的数据

src/main/java/com/dsic/gj_erp/mapper/jhgk/DmYdjhMapper.java

@@ -22,6 +22,8 @@ import java.util.Map;
  */
 public interface DmYdjhMapper extends BaseMapper<DmYdjh> {
 
+    List<DmYdjh> tqYppyzFromYdjh(DmYdjh dmYdjh);
+
     List<DmSygdMx> getSygdmx(String nextMonth);
 
     //   List<PgdTzjh> getTzjh(@Param("begin") String begin, @Param("end") String end);

src/main/java/com/dsic/gj_erp/service/jhgk/DmYdjhService.java

@@ -27,4 +27,6 @@ public interface  DmYdjhService extends IService<DmYdjh> {
 
 //    Map<String,Object> hz(List<DmYdjh> ydjhList);
     void   xf(List<DmYdjh> ydjhList, HttpServletRequest request);
+
+    List<DmYdjh> tqYppyzFromYdjh(DmYdjh dmYdjh);
 }

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

@@ -25,6 +25,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -312,6 +313,12 @@ public class DmYdjhServiceImpl extends ServiceImpl<DmYdjhMapper, DmYdjh> impleme
 //        publisher.publishEvent(ydjhList);
     }
 
+    @Override
+    public List<DmYdjh> tqYppyzFromYdjh(DmYdjh dmYdjh) {
+        baseMapper.tqYppyzFromYdjh(dmYdjh);
+        return Collections.emptyList();
+    }
+
     private DmYdjh ofXf(DmYdjh item,String gxsj){
         Long djh=this.handlerDjh(item);
         DmYdjh dmYdjh = new DmYdjh();

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

@@ -1145,6 +1145,10 @@ where dc_ch=#{dcch} and dc_pl =#{dcpl}
           and MP_SYCLJLJBP.DC_CH =#{dcCh} and MP_SYCLJLJBP.DC_TH =#{tzbh}
     </select>
 
+    <select id="tqYppyzFromYdjh" resultType="com.dsic.gj_erp.bean.jhgk.DmYdjh">
+
+    </select>
+
 
     <update id="xzylbs"   parameterType="string" >
         UPDATE dm_ydjh set dm_ydjh.ylbs=dm_bchxylp.sfyl