Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

排单参数修改

Browse Source
This commit is contained in:
liuzhaotian
2024-07-19 09:40:02 +08:00
parent e7447c4a8c
commit c9788110fb
4 changed files with 51 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlanRespVO.java
+3 -3
View File
@@ -34,9 +34,9 @@ public class PlanRespVO {
@ExcelProperty("排单状态：0 新单，1 板材已申请，2 开料中，3 已开料") @ExcelProperty("排单状态：0 新单，1 板材已申请，2 开料中，3 已开料")
private Integer status; private Integer status;
@Schema(description = "是否支付：0 否，1 是", requiredMode = Schema.RequiredMode.REQUIRED) // @Schema(description = "是否支付：0 否，1 是", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("是否支付：0 否，1 是") // @ExcelProperty("是否支付：0 否，1 是")
private Boolean isPay; // private Boolean isPay;
@Schema(description = "机台 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "16707") @Schema(description = "机台 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "16707")
@ExcelProperty("机台 ID") @ExcelProperty("机台 ID")
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/plan/PlanDO.java
+12 -12
View File
@@ -49,10 +49,10 @@ public class PlanDO extends BaseDO {
* 排单状态：0 新单，1 板材已申请，2 开料中，3 已开料 * 排单状态：0 新单，1 板材已申请，2 开料中，3 已开料
*/ */
private Integer status; private Integer status;
/** // /**
* 是否支付：0 否，1 是 // * 是否支付：0 否，1 是
*/ // */
private Boolean isPay; // private Boolean isPay;
/** /**
* 机台 ID * 机台 ID
*/ */
@@ -65,14 +65,14 @@ public class PlanDO extends BaseDO {
* 生产单号 * 生产单号
*/ */
private String orderNos; private String orderNos;
/** // /**
* 排单优化文件地址 // * 排单优化文件地址
*/ // */
private String placeDateFileUrl; // private String placeDateFileUrl;
/** // /**
* 排单优化文件地址 // * 排单优化文件地址
*/ // */
private String placeOrderFileUrl; // private String placeOrderFileUrl;
/** /**
* 备注 * 备注
*/ */
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java
+35 -34
View File
@@ -165,40 +165,41 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
@Override @Override
public Boolean savePlanPlateResult(SavePlanPlateResult result) { public Boolean savePlanPlateResult(SavePlanPlateResult result) {
PlanDO planDO = planMapper.selectById(result.getPlanId()); return null;
if (Objects.isNull(planDO)) { // PlanDO planDO = planMapper.selectById(result.getPlanId());
throw exception(PLAN_NOT_EXISTS); // if (Objects.isNull(planDO)) {
} // throw exception(PLAN_NOT_EXISTS);
try { // }
String placeDateFileUrlSource = planDO.getPlaceDateFileUrl(); // try {
String placeOrderFileUrlSource = planDO.getPlaceOrderFileUrl(); // String placeDateFileUrlSource = planDO.getPlaceDateFileUrl();
if (StrUtil.isNotBlank(placeDateFileUrlSource)) { // String placeOrderFileUrlSource = planDO.getPlaceOrderFileUrl();
fileApi.deleteFileByPath(placeDateFileUrlSource).checkError(); // if (StrUtil.isNotBlank(placeDateFileUrlSource)) {
} // fileApi.deleteFileByPath(placeDateFileUrlSource).checkError();
if (StrUtil.isNotBlank(placeOrderFileUrlSource)) { // }
fileApi.deleteFileByPath(placeOrderFileUrlSource).checkError(); // if (StrUtil.isNotBlank(placeOrderFileUrlSource)) {
} // fileApi.deleteFileByPath(placeOrderFileUrlSource).checkError();
FileCreateReqDTO fileCreateReqDTO = new FileCreateReqDTO(); // }
// FileCreateReqDTO fileCreateReqDTO = new FileCreateReqDTO();
fileCreateReqDTO.setContent(result.getPlaceData().getBytes()); //
fileCreateReqDTO.setName(result.getPlaceData().getOriginalFilename()); // fileCreateReqDTO.setContent(result.getPlaceData().getBytes());
String placeDateFileUrl = fileApi.createFile(fileCreateReqDTO).getCheckedData(); // fileCreateReqDTO.setName(result.getPlaceData().getOriginalFilename());
// String placeDateFileUrl = fileApi.createFile(fileCreateReqDTO).getCheckedData();
fileCreateReqDTO.setContent(result.getPlaceOrder().getBytes()); //
fileCreateReqDTO.setName(result.getPlaceOrder().getOriginalFilename()); // fileCreateReqDTO.setContent(result.getPlaceOrder().getBytes());
String placeOrderFileUrl = fileApi.createFile(fileCreateReqDTO).getCheckedData(); // fileCreateReqDTO.setName(result.getPlaceOrder().getOriginalFilename());
// String placeOrderFileUrl = fileApi.createFile(fileCreateReqDTO).getCheckedData();
PlanDO updateDO = PlanDO.builder() //
.id(result.getPlanId()) // PlanDO updateDO = PlanDO.builder()
.placeDateFileUrl(placeOrderFileUrl) // .id(result.getPlanId())
.placeOrderFileUrl(placeDateFileUrl) // .placeDateFileUrl(placeOrderFileUrl)
.build(); // .placeOrderFileUrl(placeDateFileUrl)
planMapper.updateById(updateDO); // .build();
// planMapper.updateById(updateDO);
} catch (IOException e) { //
throw exception(UNKNOWN); // } catch (IOException e) {
} // throw exception(UNKNOWN);
return Boolean.TRUE; // }
// return Boolean.TRUE;
} }
@Override @Override
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java
+1 -1
View File
@@ -159,7 +159,7 @@ public class PlanServiceImpl implements PlanService {
validatePlanExists(updateReqVO.getId()); validatePlanExists(updateReqVO.getId());
// 更新 // 更新
PlanDO plan = BeanUtils.toBean(updateReqVO, PlanDO.class); PlanDO plan = BeanUtils.toBean(updateReqVO, PlanDO.class);
plan.setIsPay(Boolean.FALSE);
planMapper.updateById(plan); planMapper.updateById(plan);
} }