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

新增检验项目

Browse Source
This commit is contained in:
YiLiLin 2023-06-07 13:45:22 +08:00
parent 1432647141
commit fb372dc663
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qms-api/src/main/java/com/foreverwin/iep/qms/entity/QmsQcItem.java
View File

@ -1,6 +1,7 @@
package com.foreverwin.iep.qms.entity; package com.foreverwin.iep.qms.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model; import com.baomidou.mybatisplus.extension.activerecord.Model;
@ -98,4 +99,7 @@ public class QmsQcItem extends Model<QmsQcItem> {
*/ */
@ApiModelProperty(value = "修改时间") @ApiModelProperty(value = "修改时间")
private LocalDateTime modifiedDateTime; private LocalDateTime modifiedDateTime;
@TableField(exist = false)
private boolean existQcPlan;
} }

5
qms-core/src/main/java/com/foreverwin/iep/qms/controller/QmsQcItemController.java
View File

@ -86,4 +86,9 @@ public class QmsQcItemController {
qmsQcItemService.delete(sid); qmsQcItemService.delete(sid);
return R.ok(); return R.ok();
} }
@GetMapping("/info/{qcItem}")
public R getOne(@PathVariable("qcItem") String qcItem) {
return R.ok(qmsQcItemService.getOne(TenantContextHolder.getTenantId(), qcItem));
}
} }

13
qms-core/src/main/java/com/foreverwin/iep/qms/service/impl/QmsQcItemServiceImpl.java
View File

@ -36,9 +36,14 @@ public class QmsQcItemServiceImpl extends ServiceImpl<QmsQcItemMapper, QmsQcItem
@Override @Override
public QmsQcItem getOne(String site, String qcItem) { public QmsQcItem getOne(String site, String qcItem) {
return getOne(Wrappers.lambdaQuery(QmsQcItem.class) QmsQcItem qmsQcItem = getOne(Wrappers.lambdaQuery(QmsQcItem.class)
.eq(QmsQcItem::getSite, site) .eq(QmsQcItem::getSite, site)
.eq(QmsQcItem::getQcItem, qcItem)); .eq(QmsQcItem::getQcItem, qcItem));
if (ObjectUtil.isNotNull(qmsQcItem)) {
qmsQcItem.setExistQcPlan(getQmsQcPlanDetailService().count(Wrappers.lambdaQuery(QmsQcPlanDetail.class)
.eq(QmsQcPlanDetail::getQcItemSid, qmsQcItem.getSid())) > 0);
}
return qmsQcItem;
} }
@Transactional @Transactional
@ -53,7 +58,7 @@ public class QmsQcItemServiceImpl extends ServiceImpl<QmsQcItemMapper, QmsQcItem
throw BusinessException.build(I18nUtil.getI18nText("qc.item.error13")); throw BusinessException.build(I18nUtil.getI18nText("qc.item.error13"));
} }
if (!ObjectUtil.isNull(oriQcItem)) { if (ObjectUtil.isNull(oriQcItem)) {
qmsQcItem.setSid(SidUtils.genSid()); qmsQcItem.setSid(SidUtils.genSid());
qmsQcItem.setCreatedDateTime(LocalDateTime.now()); qmsQcItem.setCreatedDateTime(LocalDateTime.now());
qmsQcItem.setCreatedUser(SecurityUtils.getUserName()); qmsQcItem.setCreatedUser(SecurityUtils.getUserName());