licq/heli-mes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

小程序问题修改

Browse Source
This commit is contained in:
Ledo 2025-01-20 21:56:28 +08:00
parent 94081fa3d7
commit f97cf8d705
11 changed files with 38 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/ErrorCodeConstants.java
View File

@ -106,6 +106,7 @@ public interface ErrorCodeConstants {
ErrorCode TASK_DISPATCH_TASK_NOT_EXISTS = new ErrorCode(1_009_004, "任务不存在或已完成");
ErrorCode TASK_DISPATCH_TASK_NO_PERMISSION_FOR_OPERATE = new ErrorCode(1_009_005, "任务不满足操作条件");
ErrorCode TASK_DISPATCH_TASK_IS_OVER = new ErrorCode(1_009_007, "报工数量已完成");
ErrorCode TASK_DISPATCH_TASK_REPORT_AMOUNT_EXCESS = new ErrorCode(1_009_006, "无法超额报工");
/*************质量管理***********/
ErrorCode UNQUALIFIED_NOTIFICATION_NOT_EXISTS = new ErrorCode(1_010_001, "品质异常通知单审核不存在");

1
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/bdgzsomthing/bdgzsomthingController.java
View File

@ -150,6 +150,7 @@ public class bdgzsomthingController {
public void init() {
selectHasPrice();
}
@Scheduled(cron = "0 0 2 * * ?") //每天十天执行一次
public void selectHasPrice(){
bdgzsomthingService.selectHasPrice();
}

9
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/processdesign/vo/ProcessDesignRespVO.java
View File

@ -89,7 +89,8 @@ public class ProcessDesignRespVO {
@Schema(description = "毛坯结束日期")
private LocalDateTime blankDate;
@Schema(description = "毛坯开始日期")
private LocalDateTime startBlankDate;
@Schema(description = "毛坯负责人名称")
private String blankOwnerName;
@ -98,7 +99,8 @@ public class ProcessDesignRespVO {
@Schema(description = "2D结束日期")
private LocalDateTime twoDimDate;
@Schema(description = "2D开始日期")
private LocalDateTime startTwoDimDate;
@Schema(description = "2D负责人名称")
private String twoDimOwnerName;
@ -107,7 +109,8 @@ public class ProcessDesignRespVO {
@Schema(description = "3D结束日期")
private LocalDateTime threeDimDate;
@Schema(description = "3D结束日期")
private LocalDateTime startThreeDimDate;
@Schema(description = "3D负责人名称")
private String threeDimOwnerName;

9
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/processdesign/ProcessDesignDO.java
View File

@ -95,7 +95,8 @@ public class ProcessDesignDO extends BaseDO {
@TableField(exist = false)
private LocalDateTime blankDate;
@TableField(exist = false)
private LocalDateTime startBlankDate;
@TableField(exist = false)
private String blankOwnerName;
@ -104,7 +105,8 @@ public class ProcessDesignDO extends BaseDO {
@TableField(exist = false)
private LocalDateTime twoDimDate;
@TableField(exist = false)
private LocalDateTime startTwoDimDate;
@TableField(exist = false)
private String twoDimOwnerName;
@ -113,7 +115,8 @@ public class ProcessDesignDO extends BaseDO {
@TableField(exist = false)
private LocalDateTime threeDimDate;
@TableField(exist = false)
private LocalDateTime startThreeDimDate;
@TableField(exist = false)
private String threeDimOwnerName;

3
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/pgmaster/PgMasterLineMapper.java
View File

@ -86,7 +86,8 @@ public interface PgMasterLineMapper extends BaseMapperX<PgMasterLineDO> {
if (reqVO.getPgType() == 1){
query.orderByDesc(PgMasterLineDO::getPgNumber);
}else{
query.orderByDesc(PlanDO::getId);
query.orderByAsc(PgMasterLineDO::getPgNumber);
// query.orderByDesc(PlanDO::getId);
}
query.eq(reqVO.getDetilUser() != null&&reqVO.getDetilUser() != 0, PgMasterLineDO::getDetilUser, reqVO.getDetilUser())
.eq(reqVO.getPgType() != null, PgMasterLineDO::getPgType, reqVO.getPgType())

2
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processdesign/ProcessDesignMapper.java
View File

@ -30,7 +30,7 @@ public interface ProcessDesignMapper extends BaseMapperX<ProcessDesignDO> {
.select("a.plan_no as planCode","a.has_craft as hasCraft", "a.craft_start_date as craftStartDate", "a.craft_end_date as craftEndDate", "e.name as customerName")
.select("d.code as projectCode", "d.project_name as projectName", "d.business_line as businessLine", "d.property","d.is_urgency as isUrgency")
.select("u1.nickname as projectOwnerName", "u2.nickname as craftOwnerName")
.select("b.blank_date as blankDate", "b.two_dim_date as twoDimDate", "b.three_dim_date as threeDimDate")
.select("b.blank_date as blankDate","b.start_blank_date as startBlankDate", "b.two_dim_date as twoDimDate","b.start_two_dim_date as startTwoDimDate", "b.three_dim_date as threeDimDate", "b.start_three_dim_date as startThreeDimDate")
.select("u3.nickname as blankOwnerName", "u4.nickname as twoDimOwnerName", "u5.nickname as threeDimOwnerName")
.select("c.name as projectSubName", "b.project_sub_code as projectSubCode")
.select("z.progress,z.blueprint_link as blueprintLink ")

4
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/zjpgmaster/ZjPgMasterLineMapper.java
View File

@ -107,9 +107,11 @@ public interface ZjPgMasterLineMapper extends BaseMapperX<ZjPgMasterLineDO> {
.leftJoin("(select SUM(c.amount) as amounts ,SUM(c.work_time) as workTime,c.zj_mx_id from quality_zj_bg_master_line c group by c.zj_mx_id) d on d.zj_mx_id = t.id")
.disableSubLogicDel();
if(reqVO.getPgType() == 1){
query.orderByDesc(ZjPgMasterLineDO::getPgNumber);
}else {
query.orderByAsc(ZjPgMasterLineDO::getTaskNo,ZjPgMasterLineDO::getPgNumber);
query.orderByAsc(ZjPgMasterLineDO::getPgNumber);
// query.orderByAsc(ZjPgMasterLineDO::getTaskNo,ZjPgMasterLineDO::getPgNumber);
}
query.eq(reqVO.getDetilUser() != null&&reqVO.getDetilUser() != 0, ZjPgMasterLineDO::getDetilUser, reqVO.getDetilUser())
.eq(reqVO.getPgType() != null, ZjPgMasterLineDO::getPgType, reqVO.getPgType())

3
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processdesign/ProcessDesignServiceImpl.java
View File

@ -217,14 +217,17 @@ public class ProcessDesignServiceImpl implements ProcessDesignService {
detailResult.getList().forEach(processDesign -> {
if(ProcessDesignTypeEnum.BLUEPRINT_WORKBLANK.name().equals(processDesign.getProcessDesignType())){
processDesignDO.setBlankDate(processDesign.getBlankDate())
.setStartBlankDate(processDesign.getStartBlankDate())
.setBlankOwnerName(processDesign.getBlankOwnerName())
.setProgressBlank(processDesign.getProgress());
}else if(ProcessDesignTypeEnum.BLUEPRINT_3D.name().equals(processDesign.getProcessDesignType())){
processDesignDO.setThreeDimDate(processDesign.getThreeDimDate())
.setStartThreeDimDate(processDesign.getStartThreeDimDate())
.setThreeDimOwnerName(processDesign.getThreeDimOwnerName())
.setProgress3d(processDesign.getProgress());
}else if(ProcessDesignTypeEnum.BLUEPRINT_2D.name().equals(processDesign.getProcessDesignType())){
processDesignDO.setTwoDimDate(processDesign.getTwoDimDate())
.setStartTwoDimDate(processDesign.getStartTwoDimDate())
.setTwoDimOwnerName(processDesign.getTwoDimOwnerName())
.setProgress2d(processDesign.getProgress());
}

1
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagelog/StorageLogServiceImpl.java
View File

@ -97,6 +97,7 @@ public class StorageLogServiceImpl implements StorageLogService {
@Override
public PageResult<StorageLogNowDO> getStorageNowPage(StorageLogPageReqVO pageReqVO) {
PageResult<StorageLogNowDO> storageLogNowDOPageResult = storageLogNowMapper.selectPage(pageReqVO);
return storageLogNowMapper.selectPage(pageReqVO);
}

5
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchServiceImpl.java
View File

@ -414,12 +414,15 @@ public class TaskDispatchServiceImpl implements TaskDispatchService {
}
// 不能超额报工
if(operate == TaskReportOperateEnum.SUBMIT){
if(operate==TaskReportOperateEnum.START || operate == TaskReportOperateEnum.SUBMIT){
List<TaskReportDO> historyReportList = taskReportMapper.selectList(new LambdaQueryWrapper<TaskReportDO>() {{
eq(TaskReportDO::getDispatchDetailId, taskDispatchDetailDO.getId())
.ne(TaskReportDO::getAmount, 0);
}});
int historyReportAmount = historyReportList.stream().mapToInt(TaskReportDO::getAmount).sum();
if (taskDispatchDetailDO.getAmount() <= historyReportAmount){
throw exception(TASK_DISPATCH_TASK_IS_OVER);
}
if(taskDispatchDetailDO.getAmount() < (historyReportAmount + operateReqVO.getAmount())){
throw exception(TASK_DISPATCH_TASK_REPORT_AMOUNT_EXCESS);
}

14
mes-ui/mini-app/src/pages/moJuSheJiReport/components/dataItem.vue
View File

@ -105,9 +105,10 @@ const getListData = async () => {
e.twoDimDate = formatDate(e.twoDimDate, "YYYY-MM-DD");
e.threeDimDate = formatDate(e.threeDimDate, "YYYY-MM-DD");
e.endTime = formatDate(e.endTime, "YYYY-MM-DD");
e.startTwoDimDate = formatDate(e.startTwoDimDate, "YYYY-MM-DD");
e.startThreeDimDate = formatDate(e.startThreeDimDate, "YYYY-MM-DD");
e.startBlankDate = formatDate(e.startBlankDate, "YYYY-MM-DD");
e.blankDate = formatDate(e.blankDate, "YYYY-MM-DD");
})
// 数组追加
dataList.value.push(...data.list)
@ -225,7 +226,12 @@ const handleClose = () =>{
<view class="product-item">项目：{{ item.projectName }}</view>
<view class="product-item">子项目：{{ item.projectSubCode || "" }}</view>
<view class="product-item">客户名称：{{ item.customerName }}</view>
<view class="product-item">工艺起止日期：{{item.twoDimDate}} ～ {{item.threeDimDate}} </view>
<view class="product-item" v-if="item.processDesignType == 'BLUEPRINT_2D'">工艺起止日期：{{item.startTwoDimDate}} ～ {{item.twoDimDate}} </view>
<view class="product-item" v-else-if ="item.processDesignType == 'BLUEPRINT_3D'">工艺起止日期：{{item.startThreeDimDate}} ～ {{item.threeDimDate}} </view>
<view class="product-item" v-else-if="item.processDesignType == 'BLUEPRINT_WORKBLANK'">工艺起止日期：{{item.startBlankDate}} ～ {{item.blankDate}} </view>
<!-- <view class="product-item" v-else-if="item.processDesignType == 'BLUEPRINT_FOUNDRY_TECHNOLOGY'">工艺起止日期：{{item.twoDimDate}} ～ {{item.threeDimDate}} </view> -->
<view class="product-item">最新进度：{{item.progress}}%</view>
<!-- <view class="product-item">预计生产日期：{{ item.startTime }} ～ {{ item.entTime }}</view> -->
</view>