From cb987c6ec508ffadffe5cb5b58021b22deb1abe1 Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Tue, 7 May 2024 11:04:37 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=B7=A5=E5=BA=8F=E4=BB=A3?= =?UTF-8?q?=E7=A0=81-=E7=94=9F=E4=BA=A7=E5=B7=A5=E5=BA=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../process/ProductionProcessController.java | 28 +---- .../process/vo/OrderProcessStepItemVO.java | 15 +-- .../admin/process/vo/ProcessPageReqVO.java | 2 +- .../admin/process/vo/ProcessRespVO.java | 23 +++- .../admin/process/vo/ProcessStepStatus.java | 18 +++ .../dal/mysql/process/OrderProcessMapper.java | 26 ----- .../mysql/process/ProcessStepItemMapper.java | 18 ++- .../dal/mysql/process/ProcessStepMapper.java | 12 +- .../process/ProductionProcessService.java | 11 +- .../process/ProductionProcessServiceImpl.java | 106 ++++++------------ .../mysql/process/ProcessStepItemMapper.xml | 45 ++++---- .../dal/mysql/process/ProcessStepMapper.xml | 26 +++-- 12 files changed, 131 insertions(+), 199 deletions(-) create mode 100644 cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/ProcessStepStatus.java diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/ProductionProcessController.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/ProductionProcessController.java index af9de560b..ab66bcfe9 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/ProductionProcessController.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/ProductionProcessController.java @@ -49,40 +49,18 @@ public class ProductionProcessController { - @GetMapping("/select") - @Operation(summary = "根据工序号查看生产工序下的加工项") - @PreAuthorize("@ss.hasPermission('manage:process:query')") - public CommonResult> selectProcess(@Valid OrderProcessReqVO reqVO){ - List orderProcessById = productionProcessService.getOrderProcessById(reqVO); - return CommonResult.success(orderProcessById); - - } - - - @PutMapping("/update") - @Operation(summary = "根据工序明细 ID 修改生产工序明细表的状态") - @Parameter(name = "id", description = "工序明细ID", required = true, example = "1") + @Operation(summary = "修改生产工序明细和步骤表的状态") @PreAuthorize("@ss.hasPermission('manage:process:update')") - public CommonResult updateProcessStatus(@Valid @RequestParam("id") Long id){ - productionProcessService.updateProcessStatus(id); + public CommonResult updateProcessStatus(@Valid @RequestBody OrderProcessStepItemVO reqVo){ + productionProcessService.updateProcessStatus(reqVo); return success(true); } - @PutMapping("/updateAll") - @Operation(summary = "修改生产步骤表的工序状态") - @PreAuthorize("@ss.hasPermission('manage:process:update')") - public CommonResult updateAllProcessStatus(@Valid @RequestBody OrderProStepReqVO reqVO){ - productionProcessService.updateAllProcessStatus(reqVO); - return success(true); - - } - - @GetMapping("/selectPlateName") diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/OrderProcessStepItemVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/OrderProcessStepItemVO.java index 50e4dba77..7a2240ae8 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/OrderProcessStepItemVO.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/OrderProcessStepItemVO.java @@ -6,24 +6,19 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -@Schema(description = "管理后台 - 生产单工序步骤表 order_process_step_{N} Response VO") +@Schema(description = "管理后台 Response VO") @Data @NoArgsConstructor @AllArgsConstructor public class OrderProcessStepItemVO { - @Schema(description = "主键-工序明细ID") - private Long id; + @Schema(description = "工序明细ID", requiredMode = Schema.RequiredMode.REQUIRED,example = "11") + private Long stepItemId; - @Schema(description = "加工项名称") - private String name; - @Schema(description = "工序组ID") - private Long orderProcessId; - - @Schema(description = "工序名称") - private String stepName; + @Schema(description = "工序步骤ID", requiredMode = Schema.RequiredMode.REQUIRED,example = "11") + private Long stepId; diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/ProcessPageReqVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/ProcessPageReqVO.java index eeb76a9ae..32d944446 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/ProcessPageReqVO.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/ProcessPageReqVO.java @@ -14,7 +14,7 @@ import lombok.ToString; public class ProcessPageReqVO extends PageParam { - @Schema(description = "工序 id", requiredMode = Schema.RequiredMode.REQUIRED,example = "12") + @Schema(description = "工序 id", requiredMode = Schema.RequiredMode.REQUIRED,example = "11") private Long id; @Schema(description = "订单状态",requiredMode = Schema.RequiredMode.REQUIRED, example = "false") diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/ProcessRespVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/ProcessRespVO.java index f052388fe..591f78b54 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/ProcessRespVO.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/ProcessRespVO.java @@ -11,12 +11,9 @@ import java.time.LocalDateTime; @Data public class ProcessRespVO { - @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "7788") + @Schema(description = "主键-生产单号", requiredMode = Schema.RequiredMode.REQUIRED, example = "11") private Long id; - @Schema(description = "生产单工序步骤ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "7788") - private Long processStepId; - @Schema(description = "自定义单号", requiredMode = Schema.RequiredMode.REQUIRED,example = "ABCD") private String customOrderNo; @@ -45,6 +42,23 @@ public class ProcessRespVO { private String phoneNumber; + @Schema(description = "生产单工序步骤ID", requiredMode = Schema.RequiredMode.REQUIRED,example = "123") + private Long processStepId; + + + @Schema(description = "工序明细ID", requiredMode = Schema.RequiredMode.REQUIRED,example = "123") + private Long processStepItemId; + + + @Schema(description = "加工项名称", requiredMode = Schema.RequiredMode.REQUIRED,example = "ABCD") + private String name; + + @Schema(description = "工序名称", requiredMode = Schema.RequiredMode.REQUIRED,example = "ABCD") + private String stepName; + + @Schema(description = "加工人", requiredMode = Schema.RequiredMode.REQUIRED,example = "ABCD") + private String manager; + @Schema(description = "业务员", requiredMode = Schema.RequiredMode.REQUIRED,example = "ABCD") private String salesman; @@ -58,7 +72,6 @@ public class ProcessRespVO { - @Schema(description = "已打包数", requiredMode = Schema.RequiredMode.REQUIRED) private Long packCount; diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/ProcessStepStatus.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/ProcessStepStatus.java new file mode 100644 index 000000000..597dcae94 --- /dev/null +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/ProcessStepStatus.java @@ -0,0 +1,18 @@ +package com.cf.imes.module.manage.controller.admin.process.vo; + + +import lombok.Data; + +@Data +public class ProcessStepStatus { + + // 工序步骤表的状态 + private Boolean processStepStatus; + + // 工序明细表的状态 + private Boolean processStepItemStatus; + + // 工序步骤表的类型 + private Long type; + +} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/process/OrderProcessMapper.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/process/OrderProcessMapper.java index 6f85abc1e..23b5c2bfa 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/process/OrderProcessMapper.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/process/OrderProcessMapper.java @@ -19,34 +19,8 @@ import java.util.List; public interface OrderProcessMapper extends BaseMapperX { - default OrderProcessNDO queryProcess( Long processId , Long orderNo) { - return selectOne(new LambdaQueryWrapperX() - .eqIfPresent(OrderProcessNDO::getId, processId) - .eqIfPresent(OrderProcessNDO::getOrderId,orderNo)); - - } - default OrderProcessNDO selectByProcessId(Long id) { - return selectOne(new LambdaQueryWrapperX() - .eqIfPresent(OrderProcessNDO::getId, id)); - - } - - - - - - default OrderProcessNDO selectStatusById( Long id ) { - return selectOne(new LambdaQueryWrapperX() - .eqIfPresent(OrderProcessNDO::getId, id)); - - } - - - @Update("UPDATE order_process SET status = #{status} WHERE id = #{id}") - void updateStatusById(@Param("id") Long id, @Param("status") Boolean status); - } diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/process/ProcessStepItemMapper.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/process/ProcessStepItemMapper.java index faa214f42..ce4eff3ae 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/process/ProcessStepItemMapper.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/process/ProcessStepItemMapper.java @@ -2,11 +2,14 @@ package com.cf.imes.module.manage.dal.mysql.process; import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX; +import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; import com.cf.imes.module.manage.controller.admin.process.vo.*; import com.cf.imes.module.manage.controller.admin.query.vo.productionStatus.OrderModuleVO; +import com.cf.imes.module.manage.dal.dataobject.process.OrderProcessNDO; import com.cf.imes.module.manage.dal.dataobject.process.OrderProcessStepItemNDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Update; import java.util.List; @@ -22,10 +25,21 @@ public interface ProcessStepItemMapper extends BaseMapperX selectPlateName(Long processStepId); - List selectItemProcess(OrderProcessReqVO reqVO); + void updateStatus(@Param("id") Long id); + + + ProcessStepStatus selectStatusById(@Param("id") Long id); + + @Update("update order_process_step_item set status = true where id = #{stepItemId}") + void updateStemStatus(Long stepItemId); - void updateStatus(OrderProStepReqVO reqVO); + default List selectStemById(Long stepId,Boolean status) { + return selectList(new LambdaQueryWrapperX() + .eqIfPresent(OrderProcessStepItemNDO::getStatus,status) + .eqIfPresent(OrderProcessStepItemNDO::getProcessStepId,stepId)); + + } } diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/process/ProcessStepMapper.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/process/ProcessStepMapper.java index 35a294cf6..9f4ab7f4a 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/process/ProcessStepMapper.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/process/ProcessStepMapper.java @@ -3,8 +3,6 @@ package com.cf.imes.module.manage.dal.mysql.process; import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX; import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; -import com.cf.imes.module.manage.controller.admin.process.vo.OrderProStepReqVO; -import com.cf.imes.module.manage.controller.admin.process.vo.OrderProcessStepItemVO; import com.cf.imes.module.manage.controller.admin.process.vo.ProcessPageReqVO; import com.cf.imes.module.manage.controller.admin.process.vo.ProcessRespVO; import com.cf.imes.module.manage.controller.admin.query.vo.productionStatus.ProductionGroupVO; @@ -13,7 +11,6 @@ import com.cf.imes.module.manage.controller.admin.query.vo.salary.PriceRateReqVO import com.cf.imes.module.manage.dal.dataobject.process.OrderProcessStepNDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Update; import java.util.List; @@ -26,19 +23,12 @@ import java.util.List; public interface ProcessStepMapper extends BaseMapperX { - default OrderProcessStepNDO selectStatusById(Long id) { - return selectOne(new LambdaQueryWrapperX() - .eqIfPresent(OrderProcessStepNDO::getId, id)); - - } - List selectOrder(ProcessPageReqVO pageReqVO); - - void updateStatusById(@Param("id") Long id, @Param("status") Boolean status); + void updateStatusById(@Param("id") Long id); // default List selectProducitonList(Long orderNo) { // return selectList(new LambdaQueryWrapperX() diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/process/ProductionProcessService.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/process/ProductionProcessService.java index 45da6bd88..4476d9913 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/process/ProductionProcessService.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/process/ProductionProcessService.java @@ -15,21 +15,12 @@ public interface ProductionProcessService { - // 查询工序订单下的加工项的详情 - List getOrderProcessById(OrderProcessReqVO reqVO); - - - // 修改工序明细表的工序状态 - void updateProcessStatus(Long id); + void updateProcessStatus(OrderProcessStepItemVO reqVo); - // 修改生产步骤表的工序状态 - void updateAllProcessStatus(OrderProStepReqVO reqVO); - - // 查看板材信息的组合名称 List selectPlateName(Long stepItemId); diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/process/ProductionProcessServiceImpl.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/process/ProductionProcessServiceImpl.java index 24804c864..63df255a8 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/process/ProductionProcessServiceImpl.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/process/ProductionProcessServiceImpl.java @@ -17,6 +17,7 @@ import com.cf.imes.module.manage.util.page.PageHelperUtil; import com.cf.imes.module.system.enums.ErrorCodeConstants; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import org.springframework.security.core.parameters.P; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; @@ -40,8 +41,6 @@ public class ProductionProcessServiceImpl implements ProductionProcessService { @Resource private ProcessStepMapper processStepMapper; - @Resource - private OrderProcessMapper orderProcessMapper; @Resource private ProcessStepItemMapper processStepItemMapper; @@ -67,28 +66,6 @@ public class ProductionProcessServiceImpl implements ProductionProcessService { // 转换成 PageResult 分页类型 return PageHelperUtil.convertToPageResult(pageInfo); - - } - - - - // 查询工序订单下的加工项的详情 - @Override - public List getOrderProcessById(OrderProcessReqVO reqVO) { - - - List orderProcessStepItemVOS = processStepItemMapper.selectItemProcess(reqVO); - - // 判断生产明细表在传入的状态查询后是否为空 - if(orderProcessStepItemVOS.isEmpty()){ - // 修改生产步骤表的工序状态 - processStepMapper.updateStatusById(reqVO.getProcessStepId(),ProcessingStatusEnum.PROCESSED.getStatus()); - return null; - } - - return orderProcessStepItemVOS; - - } @@ -96,28 +73,46 @@ public class ProductionProcessServiceImpl implements ProductionProcessService { // 修改工序明细表的工序状态 @Override - public void updateProcessStatus(Long id) { + public void updateProcessStatus(OrderProcessStepItemVO reqVo) { + + // 根据工序明细 id 查询当前生产单步骤和明细的生产状态 + ProcessStepStatus processStepStatuses = processStepItemMapper.selectStatusById(reqVo.getStepItemId()); - // 根据步骤 id 查询当前生产单工序的状态 - OrderProcessStepItemNDO orderProcessStepItemNDO = processStepItemMapper.selectById(id); + // 判断生产明细表的状态查询后是否为空 + if(processStepStatuses.getProcessStepItemStatus().equals(ProcessingStatusEnum.PROCESSED.getStatus())){ - - // 未加工状态 - Boolean status = orderProcessStepItemNDO.getStatus(); - - - // 未加工状态才可进行加工 - if (ProcessingStatusEnum.PROCESSED.getStatus().equals(status)) { + throw ServiceExceptionUtil.exception(ErrorCodeConstants.UNPROCESSED_BEFORE_PROCESSING); + } + // 判断生产工序步骤表的状态是否为空 + if(processStepStatuses.getProcessStepStatus().equals(ProcessingStatusEnum.PROCESSED.getStatus())){ throw ServiceExceptionUtil.exception(ErrorCodeConstants.UNPROCESSED_BEFORE_PROCESSING); } + // 判断生产单工序的状态是否为组件加工 + if(processStepStatuses.getType() == 7){ - // 更新加工状态 - orderProcessStepItemNDO.setStatus(ProcessingStatusEnum.PROCESSED.getStatus()); - processStepItemMapper.updateById(orderProcessStepItemNDO); + processStepItemMapper.updateStemStatus(reqVo.getStepItemId()); + List orderProcessStepItemNDOS = processStepItemMapper.selectStemById(reqVo.getStepId(),ProcessingStatusEnum.RAW.getStatus()); + if(orderProcessStepItemNDOS.isEmpty()){ + // 修改生产单工序步骤表的状态 + processStepMapper.updateStatusById(reqVo.getStepId()); + + } + + return; + + } + + try { + + // 修改生产明细表和步骤表的工序状态 + processStepItemMapper.updateStatus(reqVo.getStepItemId()); + }catch (Exception e){ + throw ServiceExceptionUtil.exception(ErrorCodeConstants.UNPROCESSED_BEFORE_PROCESSING); + } @@ -127,43 +122,6 @@ public class ProductionProcessServiceImpl implements ProductionProcessService { - // 修改生产步骤表的工序状态 - @Override - public void updateAllProcessStatus(OrderProStepReqVO reqVO) { - - - OrderProcessStepNDO orderProcessStepNDO = processStepMapper.selectStatusById(reqVO.getProcessStepId()); - // 未加工状态 - Boolean status = orderProcessStepNDO.getStatus(); - - // 未加工状态才可进行加工 - if (ProcessingStatusEnum.PROCESSED.getStatus().equals(status)) { - - throw ServiceExceptionUtil.exception(ErrorCodeConstants.UNPROCESSED_BEFORE_PROCESSING); - } - - - // 修改生产单工序步骤表的状态为已加工 - orderProcessStepNDO.setStatus(ProcessingStatusEnum.PROCESSED.getStatus()); - processStepMapper.updateById(orderProcessStepNDO); - - - // 修改生产单明细表的生产状态 - processStepItemMapper.updateStatus(reqVO); - - -/* // 查询当前工序步骤表的工序状态是否还有未加工 - List orderProcessStepNDOS = processStepMapper.selectStepList(reqVO, ProcessingStatusEnum.RAW.getStatus());*/ - - - // 修改工序表的加工状态为已加工 - orderProcessMapper.updateStatusById(orderProcessStepNDO.getOrderProcessId(),ProcessingStatusEnum.PROCESSED.getStatus()); - - - - } - - // 查看板材信息的组合名称 @Override public List selectPlateName(Long stepItemId) { diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/ProcessStepItemMapper.xml b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/ProcessStepItemMapper.xml index 3bd3aba24..abbae25b6 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/ProcessStepItemMapper.xml +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/ProcessStepItemMapper.xml @@ -19,25 +19,29 @@ - - - - - - + - + + select opsi.status as processStepItemStatus, + ops.status as processStepStatus, + ops.type as type from order_process_step_item opsi - join order_process op on opsi.order_process_id = op.id join order_process_step ops on opsi.process_step_id = ops.id - where opsi.status = #{status} and opsi.process_step_id= #{processStepId} and ops.order_process_id = #{orderProcessId}; + where opsi.id = #{id}; @@ -45,16 +49,5 @@ - - - - update order_process_step_item set status = true where process_step_id = #{processStepId} and order_process_id = #{orderProcessId}; - - - - - - \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/ProcessStepMapper.xml b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/ProcessStepMapper.xml index e1369e016..941687358 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/ProcessStepMapper.xml +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/process/ProcessStepMapper.xml @@ -6,7 +6,7 @@ - UPDATE order_process_step SET status = #{status} WHERE id = #{id} + UPDATE order_process_step SET status = true WHERE id = #{id} @@ -15,12 +15,16 @@ - - + + + + + + @@ -28,24 +32,29 @@ select distinct - ops.order_id as id, - ops.id as processStepId, + ops.order_id as orderId, o.custom_order_no as customOrderNo, o.customer as customer, o.address as address, - ops.status as status + ops.status as status, + opsi.name as name, + opsi.id as stepItemId, + ops.Name as processName, + ops.manager as manager, + ops.id as processStepId from order_process_step ops join `order` o on ops.order_id = o.id + join order_process_step_item opsi on ops.id = opsi.process_step_id and ops.processinfo_id = #{id} - and ops.status = #{status} + and opsi.status = #{status} - and ops.order_id = #{orderNo} + and o.id = #{orderNo} and o.custom_order_no = #{customOrderNo} @@ -64,7 +73,6 @@ -