java/haizhentong.git

			@@ -164,7 +164,7 @@

			@Override
			public boolean isExit(String goodsIdCode, String quasiNumber,String id) {
			Long size = this.baseMapper.selectCount(new LambdaQueryWrapper<>(TErpGoods.class).ne(id!=null,TErpGoods::getId, id).eq(TErpGoods::getGoodsIdCode, goodsIdCode).or().eq(TErpGoods::getQuasiNumber, quasiNumber));
			Long size = this.baseMapper.selectCount(new LambdaQueryWrapper<>(TErpGoods.class).ne(id!=null,TErpGoods::getId, id).and(q -> q.eq(TErpGoods::getGoodsIdCode, goodsIdCode).or().eq(TErpGoods::getQuasiNumber, quasiNumber)));
			if (size > 0) {
			return true;
			}
			@@ -367,6 +367,18 @@
			}
			wrapper.orderByDesc(BaseModel::getCreateTime);
			Page<TErpGoods> page = this.page(new Page<>(query.getPageNum(), query.getPageSize()), wrapper);
			List<TErpGoods> records = page.getRecords();
			if(records.isEmpty()){
			return page;
			}
			List<String> packingUnitId = records.stream().map(TErpGoods::getPackingUnitId).collect(Collectors.toList());
			if(!packingUnitId.isEmpty()){
			List<TErpGoodsUnit> tErpGoodsUnits = erpGoodsUnitMapper.selectBatchIds(packingUnitId);
			for (TErpGoods tErpGoods : records) {
			tErpGoodsUnits.stream().filter(t -> t.getId().equals(tErpGoods.getPackingUnitId())).findFirst().ifPresent(t -> tErpGoods.setPackingUnitName(t.getUnitName()));
			}
			}
			page.setRecords( records);
			return page;
			}

			@@ -403,6 +415,7 @@
			outboundGoodsDetailVo.setCreateBy(tErpClinicOutbound.getCreateBy());
			outboundGoodsDetailVo.setOutboundType(tErpClinicOutbound.getOutboundType());
			outboundGoodsDetailVo.setOrderNumber(tErpClinicOutbound.getOrderNumber());
			outboundGoodsDetailVo.setOutboundReason(tErpClinicOutbound.getOutboundReason());
			if(tErpClinicOutbound.getOutboundType()==6){
			TErpClinicInventory tErpClinicInventory = erpClinicInventoryMapper.selectById(tErpClinicOutbound.getInventoryId());
			outboundGoodsDetailVo.setInventoryNumber(tErpClinicInventory.getInventoryNumber());
			@@ -417,7 +430,7 @@
			outboundGoodsDetailNextVo.setWarehouseNo(tErpClinicWarehousing.getWarehouseNo());

			outboundGoodsDetailNextVo.setGoodsId(outboundGoods.getGoodsId());
			TErpGoods goods = erpGoodsMapper.selectById(outboundGoods.getGoodsId());
			TErpGoods goods = erpGoodsMapper.getGoodsById(outboundGoods.getGoodsId());
			outboundGoodsDetailNextVo.setGoodsName(goods.getGoodsName());

			outboundGoodsDetailNextVo.setTypeId(goods.getTypeId());