From 308a1977201ce8f67f2def3c3e0c7fa7c3df36ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com>
Date: Thu, 15 May 2025 10:45:41 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=AE=8C=E5=96=84=E4=BD=99=E6=96=99=E7=AE=A1?=
=?UTF-8?q?=E7=90=86=202.=E5=AE=8C=E5=96=84=E7=9C=8B=E6=9D=BF=E6=95=B0?=
=?UTF-8?q?=E6=8D=AE=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/dsic/gj_erp/bean/zyjh/DmYlInfo.java | 18 +++++++++---------
.../gj_erp/controller/zyjh/YlController.java | 3 +--
.../gj_erp/controller/zyjh/dto/YlSlDto.java | 2 +-
.../gj_erp/mapper/zyjh/DmYlInfoMapper.java | 3 +++
.../resources/mappers/zyjh/DmYlInfoMapper.xml | 5 -----
5 files changed, 14 insertions(+), 17 deletions(-)
delete mode 100644 src/main/resources/mappers/zyjh/DmYlInfoMapper.xml
diff --git a/src/main/java/com/dsic/gj_erp/bean/zyjh/DmYlInfo.java b/src/main/java/com/dsic/gj_erp/bean/zyjh/DmYlInfo.java
index 71c3a2f..76f394f 100644
--- a/src/main/java/com/dsic/gj_erp/bean/zyjh/DmYlInfo.java
+++ b/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]);
}
}
diff --git a/src/main/java/com/dsic/gj_erp/controller/zyjh/YlController.java b/src/main/java/com/dsic/gj_erp/controller/zyjh/YlController.java
index 3b30dfa..97f0012 100644
--- a/src/main/java/com/dsic/gj_erp/controller/zyjh/YlController.java
+++ b/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);
diff --git a/src/main/java/com/dsic/gj_erp/controller/zyjh/dto/YlSlDto.java b/src/main/java/com/dsic/gj_erp/controller/zyjh/dto/YlSlDto.java
index 69557e0..b367ec5 100644
--- a/src/main/java/com/dsic/gj_erp/controller/zyjh/dto/YlSlDto.java
+++ b/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;
diff --git a/src/main/java/com/dsic/gj_erp/mapper/zyjh/DmYlInfoMapper.java b/src/main/java/com/dsic/gj_erp/mapper/zyjh/DmYlInfoMapper.java
index d5f1ad5..f95e4f1 100644
--- a/src/main/java/com/dsic/gj_erp/mapper/zyjh/DmYlInfoMapper.java
+++ b/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> {
+
}
diff --git a/src/main/resources/mappers/zyjh/DmYlInfoMapper.xml b/src/main/resources/mappers/zyjh/DmYlInfoMapper.xml
deleted file mode 100644
index c332b1d..0000000
--- a/src/main/resources/mappers/zyjh/DmYlInfoMapper.xml
+++ /dev/null
@@ -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>