钢坯基础信息 棒线维护

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/actualControl/billetActual/billetActual/controller/BilletBasicInfoController.java

@@ -13,6 +13,7 @@ import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.actualControl.billetActual.billetActual.entity.BilletBasicInfo;
 import org.jeecg.modules.actualControl.billetActual.billetActual.service.IBilletBasicInfoService;
 import org.jeecg.modules.billet.billetHotsendConfig.entity.BilletHotsendTypeConfig;
+import org.jeecg.modules.billet.billetHotsendConfig.service.IBilletHotsendTypeConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
@@ -21,6 +22,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description: 钢坯基础信息
@@ -35,6 +37,9 @@ import java.util.List;
 public class BilletBasicInfoController extends JeecgController<BilletBasicInfo, IBilletBasicInfoService> {
 	@Autowired
 	private IBilletBasicInfoService billetBasicInfoService;
+
+	@Autowired
+	private IBilletHotsendTypeConfigService billetHotsendTypeConfigService;
 	
 	/**
 	 * 分页列表查询
@@ -59,6 +64,15 @@ public class BilletBasicInfoController extends JeecgController<BilletBasicInfo,
 		}
 		Page<BilletBasicInfo> page = new Page<BilletBasicInfo>(pageNo, pageSize);
 		IPage<BilletBasicInfo> pageList = billetBasicInfoService.page(page, queryWrapper);
+		List<BilletBasicInfo> list = pageList.getRecords();
+		// 处理钢坯目的地信息
+		list.forEach(item ->{
+			if(item.getStackOrCarId() != null && !item.getStackOrCarId().isEmpty()){ // 归属了目的地
+				BilletHotsendTypeConfig billetHotsendTypeConfig = billetHotsendTypeConfigService.getById(item.getBhtcId());
+				item.setBhtcId(billetHotsendTypeConfig.getTypeName());
+			}
+		});
+		pageList.setRecords(list);
 		return Result.OK(pageList);
 	}
 	

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/actualControl/billetActual/billetActual/entity/BilletBasicInfo.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import org.jeecgframework.poi.excel.annotation.Excel;
@@ -20,6 +21,7 @@ import java.util.Date;
  * @Date:   2024-05-16
  * @Version: V1.0
  */
+@Data
 @TableName("billet_basic_info")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
@@ -74,10 +76,6 @@ public class BilletBasicInfo implements Serializable {
     @Excel(name = "炉内顺序号", width = 15)
     @ApiModelProperty(value = "炉内顺序号",required = true)
     private Integer heatnoIndex;
-	/**支号*/
-//	@Excel(name = "支号", width = 15)
-//    @ApiModelProperty(value = "支号",required = true)
-//    private Integer orderNo;
 	/**钢种*/
 	@Excel(name = "钢种", width = 15)
     @ApiModelProperty(value = "钢种",required = true)
@@ -110,10 +108,6 @@ public class BilletBasicInfo implements Serializable {
 	@Excel(name = "坯号", width = 15)
     @ApiModelProperty(value = "坯号",required = true)
     private String billetNo;
-    /**顺序号*/
-//    @Excel(name = "顺序号", width = 15)
-//    @ApiModelProperty(value = "顺序号",required = true)
-//    private String orderNum;
     /**坯号*/
     @Excel(name = "坯号", width = 15)
     @ApiModelProperty(value = "坯号",required = true)
@@ -140,227 +134,13 @@ public class BilletBasicInfo implements Serializable {
     @ApiModelProperty(value = "所属表",required = true)
     private String belongTable;
 
-    public String getBelongTable() {
-        return belongTable;
-    }
+    /**堆垛或车位关联id*/
+    @Excel(name = "堆垛或车位关联id", width = 15)
+    @ApiModelProperty(value = "堆垛或车位关联id",required = true)
+    private String stackOrCarId;
 
-    public void setBelongTable(String belongTable) {
-        this.belongTable = belongTable;
-    }
-
-    public BilletBasicInfo() {
-    }
-
-
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getCreateBy() {
-        return createBy;
-    }
-
-    public void setCreateBy(String createBy) {
-        this.createBy = createBy;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public String getUpdateBy() {
-        return updateBy;
-    }
-
-    public void setUpdateBy(String updateBy) {
-        this.updateBy = updateBy;
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public String getSysOrgCode() {
-        return sysOrgCode;
-    }
-
-    public void setSysOrgCode(String sysOrgCode) {
-        this.sysOrgCode = sysOrgCode;
-    }
-
-    public String getHeatNo() {
-        return heatNo;
-    }
-
-    public void setHeatNo(String heatNo) {
-        this.heatNo = heatNo;
-    }
-
-    public Integer getCcmNo() {
-        return ccmNo;
-    }
-
-    public void setCcmNo(Integer ccmNo) {
-        this.ccmNo = ccmNo;
-    }
-
-    public Integer getStrandNo() {
-        return strandNo;
-    }
-
-    public void setStrandNo(Integer strandNo) {
-        this.strandNo = strandNo;
-    }
-
-//    public Integer getOrderNo() {
-//        return orderNo;
-//    }
-//
-//    public void setOrderNo(Integer orderNo) {
-//        this.orderNo = orderNo;
-//    }
-
-    public String getGrade() {
-        return grade;
-    }
-
-    public void setGrade(String grade) {
-        this.grade = grade;
-    }
-
-    public Integer getLength() {
-        return length;
-    }
-
-    public void setLength(Integer length) {
-        this.length = length;
-    }
-
-    public Integer getActualLength() {
-        return actualLength;
-    }
-
-    public void setActualLength(Integer actualLength) {
-        this.actualLength = actualLength;
-    }
-
-    public Integer getWidth() {
-        return width;
-    }
-
-    public void setWidth(Integer width) {
-        this.width = width;
-    }
-
-    public Integer getThickness() {
-        return thickness;
-    }
-
-    public void setThickness(Integer thickness) {
-        this.thickness = thickness;
-    }
-
-    public String getSpec() {
-        return spec;
-    }
-
-    public void setSpec(String spec) {
-        this.spec = spec;
-    }
-
-    public Integer getWeight() {
-        return weight;
-    }
-
-    public void setWeight(Integer weight) {
-        this.weight = weight;
-    }
-
-    public String getBilletNo() {
-        return billetNo;
-    }
-
-    public void setBilletNo(String billetNo) {
-        this.billetNo = billetNo;
-    }
-
-//    public String getOrderNum() {
-//        return orderNum;
-//    }
-//
-//    public void setOrderNum(String orderNum) {
-//        this.orderNum = orderNum;
-//    }
-
-    public Date getCutStartTime() {
-        return cutStartTime;
-    }
-
-    public void setCutStartTime(Date cutStartTime) {
-        this.cutStartTime = cutStartTime;
-    }
-
-    public Date getCutStopTime() {
-        return cutStopTime;
-    }
-
-    public void setCutStopTime(Date cutStopTime) {
-        this.cutStopTime = cutStopTime;
-    }
-
-    public String getRatingsResult() {
-        return ratingsResult;
-    }
-
-    public void setRatingsResult(String ratingsResult) {
-        this.ratingsResult = ratingsResult;
-    }
-
-    public String getCastingSpeed() {
-        return castingSpeed;
-    }
-
-    public void setCastingSpeed(String castingSpeed) {
-        this.castingSpeed = castingSpeed;
-    }
-
-    public String getLadleNo() {
-        return ladleNo;
-    }
-
-    public void setLadleNo(String ladleNo) {
-        this.ladleNo = ladleNo;
-    }
-
-    public Integer getHeatnoIndex() {
-        return heatnoIndex;
-    }
-
-    public void setHeatnoIndex(Integer heatnoIndex) {
-        this.heatnoIndex = heatnoIndex;
-    }
-
-    public Integer getStrandnoIndex() {
-        return strandnoIndex;
-    }
-
-    public void setStrandnoIndex(Integer strandnoIndex) {
-        this.strandnoIndex = strandnoIndex;
-    }
+    /**目的地*/
+    @Excel(name = "目的地", width = 15)
+    @ApiModelProperty(value = "目的地",required = true)
+    private String bhtcId;
 }