java/haizhentong.git

			@@ -198,7 +198,7 @@

			@Override
			public boolean isExit(String goodsIdCode, String quasiNumber,String id) {
			Long size = this.baseMapper.selectCount(new LambdaQueryWrapper<>(TErpGoods.class).eq(TErpGoods::getGoodsSource,1).ne(id!=null,TErpGoods::getId, id).and(q -> q.eq(TErpGoods::getGoodsIdCode, goodsIdCode).or().eq(TErpGoods::getQuasiNumber, quasiNumber)));
			Long size = this.baseMapper.selectCount(new LambdaQueryWrapper<>(TErpGoods.class).eq(TErpGoods::getGoodsSource,1).ne(id!=null,TErpGoods::getId, id).eq(TErpGoods::getGoodsIdCode, goodsIdCode));
			if (size > 0) {
			return true;
			}
			@@ -206,7 +206,7 @@
			}
			@Override
			public boolean isExitOne(String goodsIdCode, String quasiNumber,String id) {
			Long size = this.baseMapper.selectCount(new LambdaQueryWrapper<>(TErpGoods.class).eq(TErpGoods::getGoodsSource,1).ne(id!=null,TErpGoods::getId, id).and(q -> q.eq(TErpGoods::getQuasiNumber, quasiNumber)));
			Long size = this.baseMapper.selectCount(new LambdaQueryWrapper<>(TErpGoods.class).eq(TErpGoods::getGoodsSource,1).ne(id!=null,TErpGoods::getId, id).eq(TErpGoods::getQuasiNumber, quasiNumber));
			if (size > 0) {
			return true;
			}

			@@ -124,6 +124,7 @@
			TErpMaintenanceReminder tErpMaintenanceReminder = baseMapper.selectById(id);
			tErpMaintenanceReminderDetailVo.setId(tErpMaintenanceReminder.getId());
			tErpMaintenanceReminderDetailVo.setMaintenanceTime(tErpMaintenanceReminder.getMaintenanceTime());
			tErpMaintenanceReminderDetailVo.setSuccessTime(tErpMaintenanceReminder.getSuccessTime());
			tErpMaintenanceReminderDetailVo.setMaintenanceRecord(tErpMaintenanceReminder.getMaintenanceRecord());
			tErpMaintenanceReminderDetailVo.setMaintenancePersonId(tErpMaintenanceReminder.getMaintenancePersonId());
			if(tErpMaintenanceReminder.getMaintenancePersonId()!=null){

			@@ -45,6 +45,10 @@
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
			private LocalDateTime maintenanceTime;

			@ApiModelProperty(value = "完成时间")
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
			private LocalDateTime successTime;


			@ApiModelProperty(value = "状态 1未维护 2已维护")
			private Integer status;

	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpGoodsServiceImpl.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpMaintenanceReminderServiceImpl.java	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-system/src/main/java/com/ruoyi/system/vo/TErpMaintenanceReminderDetailVo.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史