DeXun/be-process-control-system
9
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

二级更新计划新增软推荐，计划录入和实绩内容添加入场钢卷号信息

Browse Source
This commit is contained in:
86156
2026-03-20 14:36:21 +08:00
parent bcb33f3033
commit 12b2cc7e20
15 changed files with 184 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/src/main/java/com/fizz/business/comm/OPC/MessageReceiveSchedule.java
View File

@@ -131,8 +131,6 @@ public class MessageReceiveSchedule extends BaseSchedule {
ProStoppage stoppage = new ProStoppage();
stoppage.setStartDate(lowSpeedStartTime);
stoppage.setDuration(BigDecimal.ZERO); // 初始为0，恢复后再更新
stoppage.setStopType("AUTO_LOW_SPEED");
stoppage.setRemark("stripSpeed<5 自动停机");
if (proStoppageService.save(stoppage)) {
currentStopId = stoppage.getStopid();
stopRecorded = true;

11
business/src/main/java/com/fizz/business/controller/CrmPdiPlanController.java
View File

@@ -5,7 +5,9 @@ import com.fizz.business.form.CalcPdiPlanForm;
import com.fizz.business.form.CrmPdiPlanForm;
import com.fizz.business.form.PlanQueryForm;
import com.fizz.business.service.CrmPdiPlanService;
import com.fizz.business.service.L3PickupRecommendService;
import com.fizz.business.vo.CrmPdiPlanVO;
import com.fizz.business.vo.L3PickupRecommendVO;
import com.fizz.business.vo.PdiPlanSetupInfoVO;
import com.ruoyi.common.annotation.Anonymous;
import com.ruoyi.common.core.domain.R;
@@ -25,6 +27,9 @@ public class CrmPdiPlanController {
@Resource
private CrmPdiPlanService crmPdiPlanService;
@Resource
private L3PickupRecommendService l3PickupRecommendService;
@PostMapping("/add")
@Operation(summary ="新增计划")
public R<Boolean> add(@RequestBody CrmPdiPlan crmPdiPlan) {
@@ -55,4 +60,10 @@ public class CrmPdiPlanController {
return R.ok(crmPdiPlanService.listAll(form));
}
@GetMapping("/l3PickupRecommend")
@Operation(summary ="三级领料推荐")
public R<List<L3PickupRecommendVO>> l3PickupRecommend(@RequestParam(required = false, defaultValue = "10") Integer limit) {
return R.ok(l3PickupRecommendService.listPickupRecommend(limit));
}
}

3
business/src/main/java/com/fizz/business/domain/CrmPdiPlan.java
View File

@@ -26,6 +26,9 @@ public class CrmPdiPlan implements Serializable {
@Schema(description = "钢卷号")
private String coilid;
@Schema(description = "入场钢卷号")
private String enterCoilNo;
@Schema(description = "机组号")
private String unitCode;

3
business/src/main/java/com/fizz/business/domain/CrmPdoExcoil.java
View File

@@ -27,6 +27,9 @@ public class CrmPdoExcoil implements Serializable {
@Schema(description = "来料卷")
private String entryMatId;
@Schema(description = "入场钢卷号")
private String enterCoilNo;
@Schema(description = "分切数")
private Integer subId;

1
business/src/main/java/com/fizz/business/form/CrmPdiPlanForm.java
View File

@@ -16,6 +16,7 @@ public class CrmPdiPlanForm {
private Integer seqid; // 主键ID
private String coilid; // 钢卷号
private String enterCoilNo; // 入场钢卷号
private String unitCode; // 钢卷号
private Integer picklingCount; // 酸洗次数
private Integer dummyCoilFlag; // 虚卷标识

21
business/src/main/java/com/fizz/business/mapper/L3PickupRecommendMapper.java Normal file
View File

@@ -0,0 +1,21 @@
package com.fizz.business.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import java.util.List;
import java.util.Map;
@Mapper
public interface L3PickupRecommendMapper {
@Select("SELECT action_id, coil_id, current_coil_no, priority, scan_time " +
"FROM wms_coil_pending_action " +
"WHERE action_type = 501 AND action_status = 0 AND del_flag = 0 " +
"ORDER BY priority DESC, scan_time ASC, action_id ASC LIMIT #{limit}")
List<Map<String, Object>> selectPendingActions(@Param("limit") Integer limit);
@Select("SELECT coil_id, enter_coil_no FROM wms_material_coil WHERE coil_id = #{coilId} LIMIT 1")
Map<String, Object> selectMaterialByCoilId(@Param("coilId") Long coilId);
}

10
business/src/main/java/com/fizz/business/service/L3PickupRecommendService.java Normal file
View File

@@ -0,0 +1,10 @@
package com.fizz.business.service;
import com.fizz.business.vo.L3PickupRecommendVO;
import java.util.List;
public interface L3PickupRecommendService {
List<L3PickupRecommendVO> listPickupRecommend(Integer limit);
}

3
business/src/main/java/com/fizz/business/service/impl/CrmPdiPlanServiceImpl.java
View File

@@ -61,6 +61,9 @@ public class CrmPdiPlanServiceImpl extends ServiceImpl<CrmPdiPlanMapper, CrmPdiP
*/
public boolean addCrmPdiPlan(CrmPdiPlan crmPdiPlan) {
crmPdiPlan.setStatus("READY");
if (StrUtil.isBlank(crmPdiPlan.getEnterCoilNo())) {
crmPdiPlan.setEnterCoilNo(crmPdiPlan.getCoilid());
}
return this.save(crmPdiPlan);
}

3
business/src/main/java/com/fizz/business/service/impl/CrmPdoExcoilServiceImpl.java
View File

@@ -42,6 +42,9 @@ public class CrmPdoExcoilServiceImpl extends ServiceImpl<CrmPdoExcoilMapper, Crm
* @return 是否添加成功
*/
public boolean addCrmPdoExcoil(CrmPdoExcoil crmPdoExcoil) {
if (StringUtils.isEmpty(crmPdoExcoil.getEnterCoilNo())) {
crmPdoExcoil.setEnterCoilNo(crmPdoExcoil.getEntryMatId());
}
return this.save(crmPdoExcoil);
}

81
business/src/main/java/com/fizz/business/service/impl/L3PickupRecommendServiceImpl.java Normal file
View File

@@ -0,0 +1,81 @@
package com.fizz.business.service.impl;
import com.fizz.business.mapper.L3PickupRecommendMapper;
import com.fizz.business.service.L3PickupRecommendService;
import com.fizz.business.vo.L3PickupRecommendVO;
import com.ruoyi.common.annotation.DataSource;
import com.ruoyi.common.enums.DataSourceType;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.sql.Timestamp;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@Service
public class L3PickupRecommendServiceImpl implements L3PickupRecommendService {
@Resource
private L3PickupRecommendMapper l3PickupRecommendMapper;
@Override
@DataSource(DataSourceType.L3)
public List<L3PickupRecommendVO> listPickupRecommend(Integer limit) {
int queryLimit = (limit == null || limit <= 0) ? 10 : Math.min(limit, 50);
List<Map<String, Object>> pendingActions = l3PickupRecommendMapper.selectPendingActions(queryLimit);
List<L3PickupRecommendVO> result = new ArrayList<>();
for (Map<String, Object> action : pendingActions) {
L3PickupRecommendVO vo = new L3PickupRecommendVO();
vo.setActionId(toLong(action.get("action_id")));
vo.setSourceCoilId(toLong(action.get("coil_id")));
vo.setCoilId(toStringValue(action.get("current_coil_no")));
vo.setPriority(toInteger(action.get("priority")));
vo.setScanTime(toLocalDateTime(action.get("scan_time")));
Long sourceCoilId = vo.getSourceCoilId();
if (sourceCoilId != null) {
Map<String, Object> material = l3PickupRecommendMapper.selectMaterialByCoilId(sourceCoilId);
if (material != null) {
vo.setEnterCoilNo(toStringValue(material.get("enter_coil_no")));
}
}
result.add(vo);
}
return result;
}
private Long toLong(Object value) {
if (value == null) return null;
if (value instanceof Number) return ((Number) value).longValue();
try {
return Long.parseLong(String.valueOf(value));
} catch (Exception e) {
return null;
}
}
private Integer toInteger(Object value) {
if (value == null) return null;
if (value instanceof Number) return ((Number) value).intValue();
try {
return Integer.parseInt(String.valueOf(value));
} catch (Exception e) {
return null;
}
}
private String toStringValue(Object value) {
return value == null ? null : String.valueOf(value);
}
private LocalDateTime toLocalDateTime(Object value) {
if (value == null) return null;
if (value instanceof LocalDateTime) return (LocalDateTime) value;
if (value instanceof Timestamp) return ((Timestamp) value).toLocalDateTime();
return null;
}
}

1
business/src/main/java/com/fizz/business/service/impl/PdoExCoilServiceImpl.java
View File

@@ -56,6 +56,7 @@ public class PdoExCoilServiceImpl implements PdoExCoilService {
pdoExCoilDTO.setProcessCode(SYSTEM_MODULE);
pdoExCoilDTO.setExitMatId(exitCoil.getExitMatId());
pdoExCoilDTO.setEntryMatId(exitCoil.getEntryMatId());
pdoExCoilDTO.setEnterCoilNo(plan.getEnterCoilNo());
pdoExCoilDTO.setSubId(exitCoil.getSubNum());
pdoExCoilDTO.setStartPosition(exitCoil.getStartPos());
pdoExCoilDTO.setEndPosition(exitCoil.getEndPos());

3
business/src/main/java/com/fizz/business/vo/CrmPdiPlanVO.java
View File

@@ -24,6 +24,9 @@ public class CrmPdiPlanVO {
@Schema(description = "钢卷号")
private String coilid;
@Schema(description = "入场钢卷号")
private String enterCoilNo;
@Schema(description = "机组号")
private String unitCode;

29
business/src/main/java/com/fizz/business/vo/L3PickupRecommendVO.java Normal file
View File

@@ -0,0 +1,29 @@
package com.fizz.business.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDateTime;
@Data
@Schema(description = "三级领料推荐")
public class L3PickupRecommendVO {
@Schema(description = "待操作主键")
private Long actionId;
@Schema(description = "当前钢卷号（回填到计划coilid）")
private String coilId;
@Schema(description = "入场钢卷号（回填到计划enterCoilNo）")
private String enterCoilNo;
@Schema(description = "L3钢卷ID")
private Long sourceCoilId;
@Schema(description = "优先级")
private Integer priority;
@Schema(description = "扫码时间")
private LocalDateTime scanTime;
}