diff --git a/src/main/java/com/qs/serve/modules/pms/controller/PmsOrderController.java b/src/main/java/com/qs/serve/modules/pms/controller/PmsOrderController.java index b3acfc0..d18e220 100644 --- a/src/main/java/com/qs/serve/modules/pms/controller/PmsOrderController.java +++ b/src/main/java/com/qs/serve/modules/pms/controller/PmsOrderController.java @@ -137,11 +137,13 @@ public class PmsOrderController { pmsOrder.setId(param.getOrderId()); pmsOrder.setStatus(2); pmsOrderService.updateById(pmsOrder); + return R.ok("订单已开启"); }else if (param.getStatus().equals(3)){ PmsOrder pmsOrder = new PmsOrder(); pmsOrder.setId(param.getOrderId()); pmsOrder.setStatus(3); pmsOrderService.updateById(pmsOrder); + return R.ok("订单已开启"); } return R.error("无效参数"); } @@ -151,7 +153,7 @@ public class PmsOrderController { * @param param * @return */ - //@PostMapping("/save") + @PostMapping("/save") @SysLog(module = SystemModule.PIECE, title = "生产订单", biz = BizType.INSERT) @PreAuthorize("hasRole('pms:order:insert')") public R save(@RequestBody @Valid PmsOrder param){ diff --git a/src/main/java/com/qs/serve/modules/pms/controller/PmsOrderProductController.java b/src/main/java/com/qs/serve/modules/pms/controller/PmsOrderProductController.java index ef771e1..69c4bf7 100644 --- a/src/main/java/com/qs/serve/modules/pms/controller/PmsOrderProductController.java +++ b/src/main/java/com/qs/serve/modules/pms/controller/PmsOrderProductController.java @@ -92,10 +92,10 @@ public class PmsOrderProductController { } } } - PmsOrderProduct orderProduct = new PmsOrderProduct(); - orderProduct.setOrderProductSn(param.getOrderProductSn()); - orderProduct.setFinishedStatus(param.getStatus()); - boolean result = pmsOrderProductService.updateById(orderProduct); + PmsOrderProduct pmsOrderProduct = pmsOrderProductService.getById(param.getOrderProductSn()); + if (pmsOrderProduct==null)return R.error(R.NOT_FOUND_TIPS); + pmsOrderProduct.setFinishedStatus(param.getStatus()); + boolean result = pmsOrderProductService.updateById(pmsOrderProduct); return R.isTrue(result); } 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 0d7ed27..e600291 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 @@ -117,6 +117,7 @@ public class PmsOrderSubmitController { orderSubmit.setProcessName(orderProcess.getProcessName()); orderSubmit.setProcessCode(orderProcess.getProcessCode()); LoginUser loginUser = AuthContextUtils.getLoginUser(); + //TODO 补上PersonCode orderSubmit.setPersonId(loginUser.getUserId()); orderSubmit.setPersonName(loginUser.getNick()); boolean result = pmsOrderSubmitService.save(orderSubmit); @@ -145,6 +146,7 @@ public class PmsOrderSubmitController { orderSubmit.setProcessName(orderProcess.getProcessName()); orderSubmit.setProcessCode(orderProcess.getProcessCode()); SysUser sysUser = sysUserService.getById(param.getPersonId()); + //TODO 补上PersonCode orderSubmit.setPersonName(sysUser.getName()); boolean result = pmsOrderSubmitService.save(orderSubmit); return R.isTrue(result); diff --git a/src/main/java/com/qs/serve/modules/pms/controller/PmsProductProcessController.java b/src/main/java/com/qs/serve/modules/pms/controller/PmsProductProcessController.java index 777bcba..8baed55 100644 --- a/src/main/java/com/qs/serve/modules/pms/controller/PmsProductProcessController.java +++ b/src/main/java/com/qs/serve/modules/pms/controller/PmsProductProcessController.java @@ -99,8 +99,8 @@ public class PmsProductProcessController { ppp.setProcessId(procId); return ppp; }).collect(Collectors.toList()); - pmsProductProcessService.saveBatch(newList); - return R.error(); + boolean result= pmsProductProcessService.saveBatch(newList); + return R.isTrue(result); } /** @@ -135,8 +135,8 @@ public class PmsProductProcessController { ppp.setProcessId(processId); return ppp; }).collect(Collectors.toList()); - pmsProductProcessService.saveBatch(newList); - return R.error(); + boolean result = pmsProductProcessService.saveBatch(newList); + return R.isTrue(result); } /** diff --git a/src/main/java/com/qs/serve/modules/pms/entity/PmsCounterSubmit.java b/src/main/java/com/qs/serve/modules/pms/entity/PmsCounterSubmit.java index 34d1084..45330ec 100644 --- a/src/main/java/com/qs/serve/modules/pms/entity/PmsCounterSubmit.java +++ b/src/main/java/com/qs/serve/modules/pms/entity/PmsCounterSubmit.java @@ -67,7 +67,6 @@ public class PmsCounterSubmit implements Serializable { private String personRemark; /** 核对状态 */ - @Length(max = 32,message = "核对员id长度不能超过32字") private Integer checkStatus; /** 核对员id */ @@ -83,7 +82,6 @@ public class PmsCounterSubmit implements Serializable { private String checkerCode; /** 核对时间 */ - @Length(max = 0,message = "核对时间长度不能超过0字") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") private LocalDateTime checkerTime; diff --git a/src/main/java/com/qs/serve/modules/pms/entity/PmsCounterType.java b/src/main/java/com/qs/serve/modules/pms/entity/PmsCounterType.java index b369d99..85c88f1 100644 --- a/src/main/java/com/qs/serve/modules/pms/entity/PmsCounterType.java +++ b/src/main/java/com/qs/serve/modules/pms/entity/PmsCounterType.java @@ -41,8 +41,7 @@ public class PmsCounterType implements Serializable { private String code; /** 工量单价 */ - @NotBlank(message = "工量单价不能为空") - @Length(max = 20,message = "工量单价长度不能超过20字") + @NotNull(message = "工量单价不能为空") private BigDecimal price; /** 备注 */ diff --git a/src/main/java/com/qs/serve/modules/pms/entity/PmsOrder.java b/src/main/java/com/qs/serve/modules/pms/entity/PmsOrder.java index a249869..26c02ff 100644 --- a/src/main/java/com/qs/serve/modules/pms/entity/PmsOrder.java +++ b/src/main/java/com/qs/serve/modules/pms/entity/PmsOrder.java @@ -52,7 +52,6 @@ public class PmsOrder implements Serializable { private String spec; /** 完工日期 */ - @Length(max = 0,message = "完工日期长度不能超过0字") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") private LocalDateTime finishedDate; @@ -95,6 +94,7 @@ public class PmsOrder implements Serializable { private Boolean delFlag; /** 订单产品列表 */ + @TableField(exist = false) List orderProducts; } diff --git a/src/main/java/com/qs/serve/modules/pms/entity/PmsOrderProcess.java b/src/main/java/com/qs/serve/modules/pms/entity/PmsOrderProcess.java index 758680b..8117184 100644 --- a/src/main/java/com/qs/serve/modules/pms/entity/PmsOrderProcess.java +++ b/src/main/java/com/qs/serve/modules/pms/entity/PmsOrderProcess.java @@ -27,6 +27,7 @@ public class PmsOrderProcess implements Serializable { private static final long serialVersionUID = 1L; /** 订单工序编码 */ + @NotBlank(message = "订单工序编码不能为空") @Length(max = 32,message = "订单工序编码长度不能超过32字") @TableId(type = IdType.INPUT) private String orderProcessSn; diff --git a/src/main/java/com/qs/serve/modules/pms/entity/dto/PmsOrderBo.java b/src/main/java/com/qs/serve/modules/pms/entity/dto/PmsOrderBo.java index c3c7fa5..93f7ded 100644 --- a/src/main/java/com/qs/serve/modules/pms/entity/dto/PmsOrderBo.java +++ b/src/main/java/com/qs/serve/modules/pms/entity/dto/PmsOrderBo.java @@ -41,7 +41,6 @@ public class PmsOrderBo implements Serializable { private String spec; /** 完工日期 */ - @Length(max = 0,message = "完工日期长度不能超过0字") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") private LocalDateTime finishedDate; diff --git a/src/main/java/com/qs/serve/modules/pms/entity/dto/PmsOrderProductStatusBo.java b/src/main/java/com/qs/serve/modules/pms/entity/dto/PmsOrderProductStatusBo.java index 82e27e3..6cd1dfb 100644 --- a/src/main/java/com/qs/serve/modules/pms/entity/dto/PmsOrderProductStatusBo.java +++ b/src/main/java/com/qs/serve/modules/pms/entity/dto/PmsOrderProductStatusBo.java @@ -10,7 +10,7 @@ import lombok.Data; public class PmsOrderProductStatusBo { /** OrderProductSn */ - private String OrderProductSn; + private String orderProductSn; /** * 状态: diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index c92699e..f49586d 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -8,7 +8,7 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver #url: jdbc:mysql://192.168.0.9:3306/gy_oa_qs?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai - url: jdbc:mysql://192.168.0.9:3333/qs-base?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true + url: jdbc:mysql://192.168.0.9:3333/qs-base-pms-demo?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true username: root password: 123456 redis: