diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/StockScreenServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/StockScreenServiceImpl.java index 3d9b193..0d4f196 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/StockScreenServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/StockScreenServiceImpl.java @@ -29,10 +29,10 @@ public class StockScreenServiceImpl implements IStockScreenService { List list = basStockService.selectBasStockListApi(new BasStock()); BigDecimal total = BigDecimal.ZERO; for (BasStock s : list) { - String q = s.getQuantity(); - if (q != null && !q.trim().isEmpty()) { + BigDecimal quantity = s.getQuantity(); + if (quantity != null && quantity.doubleValue()!=0) { try { - total = total.add(new BigDecimal(q.trim())); + total = total.add(quantity); } catch (Exception ignored) { } } @@ -134,4 +134,4 @@ public class StockScreenServiceImpl implements IStockScreenService { return 0; } } -} \ No newline at end of file +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/difference/controller/CheckDifferenceRecordController.java b/ruoyi-admin/src/main/java/com/ruoyi/check/difference/controller/CheckDifferenceRecordController.java index 8804a42..ff4e0fa 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/check/difference/controller/CheckDifferenceRecordController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/check/difference/controller/CheckDifferenceRecordController.java @@ -29,6 +29,7 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; @@ -196,7 +197,7 @@ public class CheckDifferenceRecordController extends BaseController { newStock.setStockStatus("1"); // 设置库存状态为正常 newStock.setWarehouseId(record.getWarehouseId()); newStock.setInType(""); - newStock.setOutQuantity("0"); + newStock.setOutQuantity(BigDecimal.ZERO); newStock.setInDate(DateUtil.formatDateTime(DateUtil.date())); //供应商 newStock.setPhase(checkDifferenceRecordAddInfo.getSpare3()); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/difference/domain/CheckDifferenceRecord.java b/ruoyi-admin/src/main/java/com/ruoyi/check/difference/domain/CheckDifferenceRecord.java index f0b329f..ddd5f86 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/check/difference/domain/CheckDifferenceRecord.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/check/difference/domain/CheckDifferenceRecord.java @@ -6,6 +6,8 @@ import com.ruoyi.common.domain.ExtraField; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; +import java.math.BigDecimal; + /** * 盘点差异对象 check_difference_record * @@ -55,11 +57,11 @@ public class CheckDifferenceRecord extends BaseEntity /** 原值 */ @Excel(name = "原值") - private String oldQuantity; + private BigDecimal oldQuantity; /** 新值 */ @Excel(name = "新值") - private String newQuantity; + private BigDecimal newQuantity; /** 操作方式 */ @Excel(name = "操作方式") @@ -210,22 +212,22 @@ public class CheckDifferenceRecord extends BaseEntity return customer; } - public void setOldQuantity(String oldQuantity) + public void setOldQuantity(BigDecimal oldQuantity) { this.oldQuantity = oldQuantity; } - public String getOldQuantity() + public BigDecimal getOldQuantity() { return oldQuantity; } - public void setNewQuantity(String newQuantity) + public void setNewQuantity(BigDecimal newQuantity) { this.newQuantity = newQuantity; } - public String getNewQuantity() + public BigDecimal getNewQuantity() { return newQuantity; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/difference/service/impl/CheckDifferenceRecordServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/check/difference/service/impl/CheckDifferenceRecordServiceImpl.java index c619c8e..d33ec99 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/check/difference/service/impl/CheckDifferenceRecordServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/check/difference/service/impl/CheckDifferenceRecordServiceImpl.java @@ -18,6 +18,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.util.Date; import java.util.List; @@ -112,7 +113,7 @@ public class CheckDifferenceRecordServiceImpl implements ICheckDifferenceRecordS return AjaxResult.error(MessageUtils.message("error.message9")); } checkDifferenceRecord.setCargoSpaceId(cargoSpaces.get(0).getCargoSpaceId()); - checkDifferenceRecord.setOldQuantity("0"); + checkDifferenceRecord.setOldQuantity(new BigDecimal(0)); }else if (checkDifferenceRecord.getRecordType()==3){ BasStock basStock = basStockService.selectBasStockByStockId(checkDifferenceRecord.getStockId()); if (!"1".equals(basStock.getProductStatus())){ @@ -121,7 +122,7 @@ public class CheckDifferenceRecordServiceImpl implements ICheckDifferenceRecordS } basStock.setProductStatus("2"); basStockService.updateBasStock(basStock); - checkDifferenceRecord.setNewQuantity("0"); + checkDifferenceRecord.setNewQuantity(new BigDecimal(0)); checkDifferenceRecord.setCargoSpaceId(basStock.getCargoSpaceId()); checkDifferenceRecord.setTrayCode(basStock.getTrayCode()); checkDifferenceRecord.setProductId(basStock.getProductId()); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java index 7b18010..95525ad 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java @@ -402,12 +402,12 @@ public class MydoJobServiceImpl implements IMydoJobService { stock.setStockId(basJobIdService.getJobId("KC")); stock.setCargoSpaceId(mydoJob.getCargoSpaceId()); stock.setStockStatus("1"); - stock.setOutQuantity("0"); + stock.setOutQuantity(BigDecimal.ZERO); stock.setProductStatus(productStatus); stock.setLotNo(mydoJobDetail.getLotNo()); stock.setInDate(DateUtil.formatDateTime(new Date())); stock.setProductGuid(mydoJobDetail.getProductGuid()); - stock.setQuantity(mydoJobDetail.getInQuantity()); + stock.setQuantity(Convert.toBigDecimal(mydoJobDetail.getInQuantity())); stock.setJobId(mydoJob.getJobId()); stock.setTrayCode(mydoJob.getTrayCode()); stock.setWarehouseId(mydoJob.getWarehouseId()); @@ -471,7 +471,7 @@ public class MydoJobServiceImpl implements IMydoJobService { if (basStock != null) { BigDecimal outQuantity = Convert.toBigDecimal(basStock.getOutQuantity()); BigDecimal substract = outQuantity.subtract(Convert.toBigDecimal(detail.getOutQuantity())); - basStock.setOutQuantity(String.valueOf(substract)); + basStock.setOutQuantity(substract); basStockMapper.updateBasStock(basStock); } //修改单据数量 @@ -561,7 +561,7 @@ public class MydoJobServiceImpl implements IMydoJobService { if (basStock != null) { BigDecimal outQuantity = Convert.toBigDecimal(basStock.getOutQuantity()); BigDecimal substract = outQuantity.subtract(Convert.toBigDecimal(mydoJobDetail.getOutQuantity())); - basStock.setOutQuantity(String.valueOf(substract)); + basStock.setOutQuantity(substract); basStockService.updateBasStock(basStock); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/maintain/domain/BasStockMaintainRecord.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/maintain/domain/BasStockMaintainRecord.java index 2666d8d..8184a50 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/stock/maintain/domain/BasStockMaintainRecord.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/maintain/domain/BasStockMaintainRecord.java @@ -7,6 +7,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import org.springframework.format.annotation.DateTimeFormat; +import java.math.BigDecimal; import java.util.Date; /** @@ -55,11 +56,11 @@ public class BasStockMaintainRecord extends BaseEntity /** 初始数量 */ @Excel(name = "初始数量") - private String oldQuantity; + private BigDecimal oldQuantity; /** 操作后数量 */ @Excel(name = "操作后数量") - private String quantity; + private BigDecimal quantity; /** 操作 */ @Excel(name = "操作", dictType="stock_maintain_method") @@ -210,22 +211,22 @@ public class BasStockMaintainRecord extends BaseEntity return lotNo; } - public void setOldQuantity(String oldQuantity) + public void setOldQuantity(BigDecimal oldQuantity) { this.oldQuantity = oldQuantity; } - public String getOldQuantity() + public BigDecimal getOldQuantity() { return oldQuantity; } - public void setQuantity(String quantity) + public void setQuantity(BigDecimal quantity) { this.quantity = quantity; } - public String getQuantity() + public BigDecimal getQuantity() { return quantity; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/domain/BasStock.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/domain/BasStock.java index 353ae45..99b2cd2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/domain/BasStock.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/domain/BasStock.java @@ -8,6 +8,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import lombok.ToString; +import java.math.BigDecimal; import java.util.List; /** @@ -81,7 +82,7 @@ public class BasStock extends BaseEntity { private String spare8; private String voltage; - + private String phase; private String netWeight; private String grossWeight; @@ -94,7 +95,7 @@ public class BasStock extends BaseEntity { * 库存数量 */ @Excel(name = "库存数量",sort=10) - private String quantity; + private BigDecimal quantity; /** * 作业ID @@ -153,7 +154,7 @@ public class BasStock extends BaseEntity { /** * 出库数量 */ - private String outQuantity; + private BigDecimal outQuantity; /** * 入库班组ID diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/impl/BasStockServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/impl/BasStockServiceImpl.java index 3effe05..8c9e4aa 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/impl/BasStockServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/impl/BasStockServiceImpl.java @@ -1,6 +1,7 @@ package com.ruoyi.stock.stock.service.impl; import cn.hutool.core.util.IdUtil; +import com.ruoyi.bas.cargoSpace.domain.BasCargoSpace; import com.ruoyi.bas.cargoSpace.service.IBasCargoSpaceService; import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.core.domain.AjaxResult; @@ -116,8 +117,22 @@ public class BasStockServiceImpl implements IBasStockService public int updateBasStock(BasStock basStock) { BasStock oldBasStock = basStockMapper.selectBasStockByStockId(basStock.getStockId()); - insertMaintainRecord(oldBasStock,basStock,"2"); - insertFreezeRecord(oldBasStock,basStock); + //修改库存记录 + insertMaintainRecord(oldBasStock, basStock, "2"); + //修改冻结记录 + insertFreezeRecord(oldBasStock, basStock); + //修改货位 + if (!oldBasStock.getCargoSpaceId().equals(basStock.getCargoSpaceId())){ + BasCargoSpace oldBasCargoSpace = basCargoSpaceService.selectBasCargoSpaceByCargoSpaceId(oldBasStock.getCargoSpaceId()); + oldBasCargoSpace.setStatus("1"); + oldBasCargoSpace.setTrayCode(""); + basCargoSpaceService.updateBasCargoSpace(oldBasCargoSpace); + BasCargoSpace basCargoSpace = basCargoSpaceService.selectBasCargoSpaceByCargoSpaceId(basStock.getCargoSpaceId()); + basCargoSpace.setStatus("2"); + basCargoSpace.setTrayCode(oldBasCargoSpace.getTrayCode()); + basCargoSpaceService.updateBasCargoSpace(basCargoSpace); + } + //修改货位 return basStockMapper.updateBasStock(basStock); }