diff --git a/src/main/java/com/qs/serve/modules/pms/controller/PmsOrderSubmitController.java b/src/main/java/com/qs/serve/modules/pms/controller/PmsOrderSubmitController.java index 2a7d90e..a7b289f 100644 --- a/src/main/java/com/qs/serve/modules/pms/controller/PmsOrderSubmitController.java +++ b/src/main/java/com/qs/serve/modules/pms/controller/PmsOrderSubmitController.java @@ -1,15 +1,25 @@ package com.qs.serve.modules.pms.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.qs.serve.common.framework.security.model.LoginUser; import com.qs.serve.common.model.annotation.SysLog; import com.qs.serve.common.model.dto.PageVo; import com.qs.serve.common.model.dto.R; import com.qs.serve.common.model.enums.BizType; import com.qs.serve.common.model.enums.SystemModule; +import com.qs.serve.common.util.AuthContextUtils; import com.qs.serve.common.util.CopierUtil; import com.qs.serve.common.util.PageUtil; +import com.qs.serve.modules.pms.entity.PmsOrderProcess; +import com.qs.serve.modules.pms.entity.PmsOrderProduct; +import com.qs.serve.modules.pms.entity.PmsProduct; import com.qs.serve.modules.pms.entity.dto.PmsOrderSubmitSaveBo; import com.qs.serve.modules.pms.entity.dto.PmsOrderSubmitUpdateBo; +import com.qs.serve.modules.pms.service.PmsOrderProcessService; +import com.qs.serve.modules.pms.service.PmsOrderProductService; +import com.qs.serve.modules.pms.service.PmsProductService; +import com.qs.serve.modules.sys.entity.SysUser; +import com.qs.serve.modules.sys.service.SysUserService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.security.access.prepost.PreAuthorize; @@ -33,6 +43,9 @@ import java.util.List; public class PmsOrderSubmitController { private PmsOrderSubmitService pmsOrderSubmitService; + private PmsOrderProductService pmsOrderProductService; + private PmsOrderProcessService pmsOrderProcessService; + private SysUserService sysUserService; /** * 翻页查询 @@ -70,22 +83,62 @@ public class PmsOrderSubmitController { @SysLog(module = SystemModule.PIECE, title = "订单报工单", biz = BizType.UPDATE) @PreAuthorize("hasRole('pms:orderSubmit:update')") public R updateById(@RequestBody @Valid PmsOrderSubmitUpdateBo param){ + //TODO 判断订单状态 PmsOrderSubmit orderSubmit = CopierUtil.copy(param,new PmsOrderSubmit()); boolean result = pmsOrderSubmitService.updateById(orderSubmit); return R.isTrue(result); } + /** + * 新增订单报工单(员工接口) + * @param param + * @return + */ + @PostMapping("/saveSelf") + @SysLog(module = SystemModule.PIECE, title = "订单报工单",desc = "员工新增报工单", biz = BizType.INSERT) + public R saveSelf(@RequestBody @Valid PmsOrderSubmitSaveBo param){ + //TODO 是否分工进行,分组拦截 + PmsOrderSubmit orderSubmit = CopierUtil.copy(param,new PmsOrderSubmit()); + PmsOrderProcess orderProcess = pmsOrderProcessService.getById(param.getOrderProcessSn()); + PmsOrderProduct orderProduct = pmsOrderProductService.getById(orderProcess.getOrderProductSn()); + orderSubmit.setOrderId(orderProcess.getOrderId()); + orderSubmit.setOrderProductSn(orderProcess.getOrderProductSn()); + orderSubmit.setProductId(orderProcess.getProductId()); + orderSubmit.setProductCode(orderProduct.getCode()); + orderSubmit.setProductName(orderProduct.getName()); + orderSubmit.setProcessId(orderProcess.getProcessId()); + orderSubmit.setProcessName(orderProcess.getProcessName()); + orderSubmit.setProcessCode(orderProcess.getProcessCode()); + LoginUser loginUser = AuthContextUtils.getLoginUser(); + orderSubmit.setPersonId(loginUser.getUserId()); + orderSubmit.setPersonName(loginUser.getNick()); + boolean result = pmsOrderSubmitService.save(orderSubmit); + return R.isTrue(result); + } + /** * 新增订单报工单(管理员接口) * @param param * @return */ @PostMapping("/save") - @SysLog(module = SystemModule.PIECE, title = "订单报工单", biz = BizType.INSERT) + @SysLog(module = SystemModule.PIECE, title = "订单报工单",desc = "管理员新增报工单", biz = BizType.INSERT) @PreAuthorize("hasRole('pms:orderSubmit:insert')") public R save(@RequestBody @Valid PmsOrderSubmitSaveBo param){ + //TODO 是否分工进行,分组拦截 PmsOrderSubmit orderSubmit = CopierUtil.copy(param,new PmsOrderSubmit()); - + PmsOrderProcess orderProcess = pmsOrderProcessService.getById(param.getOrderProcessSn()); + PmsOrderProduct orderProduct = pmsOrderProductService.getById(orderProcess.getOrderProductSn()); + orderSubmit.setOrderId(orderProcess.getOrderId()); + orderSubmit.setOrderProductSn(orderProcess.getOrderProductSn()); + orderSubmit.setProductId(orderProcess.getProductId()); + orderSubmit.setProductCode(orderProduct.getCode()); + orderSubmit.setProductName(orderProduct.getName()); + orderSubmit.setProcessId(orderProcess.getProcessId()); + orderSubmit.setProcessName(orderProcess.getProcessName()); + orderSubmit.setProcessCode(orderProcess.getProcessCode()); + SysUser sysUser = sysUserService.getById(param.getPersonId()); + orderSubmit.setPersonName(sysUser.getName()); boolean result = pmsOrderSubmitService.save(orderSubmit); return R.isTrue(result); } diff --git a/src/main/java/com/qs/serve/modules/pms/entity/dto/PmsOrderSubmitSaveBo.java b/src/main/java/com/qs/serve/modules/pms/entity/dto/PmsOrderSubmitSaveBo.java index bf91ce1..5158644 100644 --- a/src/main/java/com/qs/serve/modules/pms/entity/dto/PmsOrderSubmitSaveBo.java +++ b/src/main/java/com/qs/serve/modules/pms/entity/dto/PmsOrderSubmitSaveBo.java @@ -18,11 +18,6 @@ public class PmsOrderSubmitSaveBo implements Serializable { private static final long serialVersionUID = 1L; - /** 订单产线编码 */ - @NotBlank(message = "产线编码不能为空") - @Length(max = 32,message = "产线编码长度不能超过32字") - private String orderProductSn; - /** 订单工序编码 */ @NotBlank(message = "订单工序编码不能为空") @Length(max = 32,message = "订单工序编码长度不能超过32字")