java/haizhentong.git

			@@ -13,14 +13,13 @@
			import com.ruoyi.system.dto.InventoryGoodsDto;
			import com.ruoyi.system.mapper.*;
			import com.ruoyi.system.model.*;
			import com.ruoyi.system.query.TClinicGoodsWarehouseQuery;
			import com.ruoyi.system.query.TErpGoodsAdminQuery;
			import com.ruoyi.system.query.TErpGoodsInventoryQuery;
			import com.ruoyi.system.query.TErpGoodsQuery;
			import com.ruoyi.system.query.*;
			import com.ruoyi.system.service.TErpGoodsService;
			import com.ruoyi.system.service.TErpSupplierInventoryGoodsService;
			import com.ruoyi.system.vo.*;
			import org.springframework.stereotype.Service;
			import org.springframework.transaction.annotation.Propagation;
			import org.springframework.transaction.annotation.Transactional;

			import javax.annotation.Resource;
			import java.math.BigDecimal;
			@@ -151,6 +150,11 @@
			}

			@Override
			public List<TErpGoods> pageAddList(Page<TErpGoods> tErpGoodsPage, String clinicSupplierId, PageAddListQuery query) {
			return this.baseMapper.pageAddList(tErpGoodsPage, clinicSupplierId, query);
			}

			@Override
			public List<TErpGoodsVO> listExport(TErpGoodsQuery query, SysUser user) {
			List<TErpGoodsVO> list = this.baseMapper.listExport(query, user);
			if (list.isEmpty()) {
			@@ -183,7 +187,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).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).and(q -> q.eq(TErpGoods::getGoodsIdCode, goodsIdCode).or().eq(TErpGoods::getQuasiNumber, quasiNumber)));
			if (size > 0) {
			return true;
			}
			@@ -479,6 +483,7 @@
			}

			@Override
			@Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
			public void inventoryGoods(InventoryDto dto, SysUser user) {
			Integer roleType = user.getRoleType();
			String supplierClinicId = null;
			@@ -520,8 +525,8 @@
			tErpSupplierWarehousing.setGoodsId(tErpSupplierWarehousing1.getGoodsId());
			tErpSupplierWarehousing.setGoodsName(erpGoods.getGoodsName());
			tErpSupplierWarehousing.setGoodsCount(inventoryGoodsDto.getInventoryCount() - inventoryGoodsDto.getNum());
			tErpSupplierWarehousing.setUnitAmount(erpGoods.getSalesAmount());
			tErpSupplierWarehousing.setTotalPrice(erpGoods.getSalesAmount().multiply(new BigDecimal(tErpSupplierWarehousing.getGoodsCount())));
			tErpSupplierWarehousing.setUnitAmount(tErpSupplierWarehousing1.getUnitAmount());
			tErpSupplierWarehousing.setTotalPrice(tErpSupplierWarehousing1.getUnitAmount().multiply(new BigDecimal(tErpSupplierWarehousing.getGoodsCount())));
			// 当前年月日时分秒
			String time = DateUtils.dateTimeNow();
			tErpSupplierWarehousing.setWarehouseNo("G" + time);
			@@ -551,6 +556,9 @@

			} else {

			TErpSupplierWarehousingBatch tErpSupplierWarehousingBatch1 = erpSupplierWarehousingBatchMapper.selectById(inventoryGoodsDto.getId());
			String warehousingId1 = tErpSupplierWarehousingBatch1.getWarehousingId();
			TErpSupplierWarehousing tErpSupplierWarehousing2 = erpSupplierWarehousingMapper.selectById(warehousingId1);

			TErpSupplierOutbound tErpSupplierOutbound = new TErpSupplierOutbound();
			tErpSupplierOutbound.setWarehouseId(dto.getWarehouseId());
			@@ -558,7 +566,8 @@
			tErpSupplierOutbound.setOutboundType(6);
			tErpSupplierOutbound.setOutboundNumber("G" + s);
			int count = inventoryGoodsDto.getNum() - inventoryGoodsDto.getInventoryCount();
			tErpSupplierOutbound.setTotalMoney(erpGoods.getSalesAmount().multiply(new BigDecimal(count)));
			tErpSupplierOutbound.setTotalMoney(tErpSupplierWarehousing1.getUnitAmount().multiply(new BigDecimal(count)));
			tErpSupplierOutbound.setGoodsId(tErpSupplierWarehousing2.getGoodsId());
			erpSupplierOutboundMapper.insert(tErpSupplierOutbound);


			@@ -567,7 +576,7 @@
			tErpSupplierOutboundGoods.setWarehousingId(tErpSupplierWarehousing1.getId());
			tErpSupplierOutboundGoods.setWarehousingBatchId(tErpSupplierWarehousingBatch.getId());
			tErpSupplierOutboundGoods.setOutboundCount(count);
			tErpSupplierOutboundGoods.setTotalPrice(erpGoods.getSalesAmount().multiply(new BigDecimal(count)));
			tErpSupplierOutboundGoods.setTotalPrice(tErpSupplierWarehousing1.getUnitAmount().multiply(new BigDecimal(count)));
			erpSupplierOutboundGoodsMapper.insert(tErpSupplierOutboundGoods);