1.完善余料管理

2.完善看板数据表

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

@@ -23,11 +23,11 @@ public class DmYlInfo {
 
     private String 规格;//规格
 
-    private BigDecimal 厚;
+    private BigDecimal 板厚;
 
-    private BigDecimal 宽;
+    private BigDecimal 板宽;
 
-    private BigDecimal 长;
+    private BigDecimal 板长;
 
     private String 炉批号;
 
@@ -81,9 +81,9 @@ public class DmYlInfo {
         }
         //必须保证材质相同,厚度相同,宽和长要小于余料的宽和长才能使用
         return ydjh.getWpxh().equals(物品型号)
-                &&new BigDecimal(split[0]).compareTo(厚)==0
-                &&new BigDecimal(split[1]).compareTo(宽)<=0
-                &&new BigDecimal(split[1]).compareTo(长)<=0;
+                &&new BigDecimal(split[0]).compareTo(板厚)==0
+                &&new BigDecimal(split[1]).compareTo(板宽)<=0
+                &&new BigDecimal(split[1]).compareTo(板长)<=0;
     }
 
     public void 修正上料信息(DmYdjh ydjh){
@@ -102,9 +102,9 @@ public class DmYlInfo {
         if (dmYlInfo.规格!=null){
             String[] split = dmYlInfo.规格.split("\\*");
             if (split.length>=3){
-                dmYlInfo.厚=new BigDecimal(split[0]);
-                dmYlInfo.宽=new BigDecimal(split[1]);
-                dmYlInfo.长=new BigDecimal(split[2]);
+                dmYlInfo.板厚=new BigDecimal(split[0]);
+                dmYlInfo.板宽=new BigDecimal(split[1]);
+                dmYlInfo.板长=new BigDecimal(split[2]);
             }
         }
 

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

@@ -64,7 +64,7 @@ public class YlController {
                     .eq(DmYdjh::getDcCh, item.get使用船号())
                     .eq(DmYdjh::getTzbh,item.get使用图纸())
             );
-            List<DmYdjh> collect = ydjhList.stream().map(it -> {
+            List<DmYdjh> collect = ydjhList.stream().peek(it -> {
                 it.setSllph(item.get炉批号());
                 it.setSlfkrq(date);
                 //fixme 不确定是否还需要抛丸,先执行到上料
@@ -72,7 +72,6 @@ public class YlController {
                 if ("17".equals(it.getKw())){//光电直接切割
                     it.setZtForHXFK();
                 }
-                return it;
             }).collect(Collectors.toList());
 
             updateList.addAll(collect);

src/main/java/com/dsic/gj_erp/controller/zyjh/dto/YlSlDto.java

@@ -17,7 +17,7 @@ public class YlSlDto {
     private String dw;
     private String gg;
     private String lph;
-    private int status;
+    private Integer status;
 
     private List<DmYlInfo> ylList;
 

src/main/java/com/dsic/gj_erp/mapper/zyjh/DmYlInfoMapper.java

@@ -2,6 +2,9 @@ package com.dsic.gj_erp.mapper.zyjh;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.dsic.gj_erp.bean.zyjh.DmYlInfo;
+import org.apache.ibatis.annotations.Mapper;
 
+@Mapper
 public interface DmYlInfoMapper extends BaseMapper<DmYlInfo> {
+
 }

src/main/resources/mappers/zyjh/DmYlInfoMapper.xml

@@ -1,5 +0,0 @@
-<?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.zyjh.DmYlInfoMapper">
-
-</mapper>