bonus
/
cqdevicemgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码中金额、数量类型修改

This commit is contained in:
liang.chao 2024-09-06 13:46:06 +08:00
parent 5639054cfd
commit 9c39f36d8e
14 changed files with 30 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaInputRecord.java
View File

@ -45,7 +45,7 @@ public class MaInputRecord extends BaseEntity
* 库存数量
*/
@ApiModelProperty(value = "库存数量")
private Double num;
private Integer num;
/** 入库数量 */
@ApiModelProperty(value = "入库数量")
@ -117,11 +117,11 @@ public class MaInputRecord extends BaseEntity
return inputType;
}
public Double getNum() {
public Integer getNum() {
return num;
}
public void setNum(Double num) {
public void setNum(Integer num) {
this.num = num;
}

2
sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SltAgreementDetails.java
View File

@ -34,7 +34,7 @@ public class SltAgreementDetails {
/**
*数量
*/
private String num;
private Integer num;
/**
*开始时间
*/

4
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/mapper/BackReceiveMapper.java
View File

@ -186,9 +186,9 @@ public interface BackReceiveMapper {
int updateStlInfo(@Param("info") SltAgreementInfo info,@Param("record") BackApplyInfo record);
int updateStlInfoTwo(@Param("info") SltAgreementInfo info,@Param("record") BackApplyInfo record, @Param("backNum") Double backNum);
int updateStlInfoTwo(@Param("info") SltAgreementInfo info,@Param("record") BackApplyInfo record, @Param("backNum") Integer backNum);
int insStlInfoTwo(@Param("info")SltAgreementInfo info, @Param("many")Double many);
int insStlInfoTwo(@Param("info")SltAgreementInfo info, @Param("many")Integer many);
List<BackApplyInfo> getAllList(BackApplyInfo record);

6
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java
View File

@ -290,9 +290,9 @@ public class BackReceiveServiceImpl implements BackReceiveService {
for (BackApplyInfo bean : hgList) {
List<SltAgreementInfo> infoList = backReceiveMapper.getStlInfo(bean);
if (infoList.size() > 0) {
Double backNum = Double.valueOf(bean.getBackNum());
Integer backNum = bean.getBackNum();
for (SltAgreementInfo info : infoList) {
Double num = Double.valueOf(info.getNum());
Integer num = info.getNum();
if (backNum.equals(num)) {
backReceiveMapper.updateStlInfo(info, record);
break;
@ -300,7 +300,7 @@ public class BackReceiveServiceImpl implements BackReceiveService {
backNum = backNum - num;
backReceiveMapper.updateStlInfo(info, record);
} else if (backNum < num) {
Double many = num - backNum;
Integer many = num - backNum;
backReceiveMapper.updateStlInfoTwo(info, record, backNum);
backReceiveMapper.insStlInfoTwo(info, many);
break;

2
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/RepairApplyRecord.java
View File

@ -36,7 +36,7 @@ public class RepairApplyRecord implements Serializable {
* 维修数量
*/
@ApiModelProperty(value = "维修数量")
private int repairNum;
private Integer repairNum;
/**
* 报废数量
*/

4
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/RepairPartDetails.java
View File

@ -47,7 +47,7 @@ public class RepairPartDetails {
* 配件数量
*/
@ApiModelProperty(value = "配件数量")
private int partNum;
private Integer partNum;
/**
* 配件费用
*/
@ -96,5 +96,5 @@ public class RepairPartDetails {
private Long companyId;
private Long repairer;
@ApiModelProperty(value = "维修数量")
private int repairNum;
private Integer repairNum;
}

2
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackRecord.java
View File

@ -74,7 +74,7 @@ public class BackRecord {
*/
@ApiModelProperty(value = "退料数量")
@Excel(name = "退料数量",cellType = Excel.ColumnType.NUMERIC)
private Double backNum;
private Integer backNum;
/**
* 退料人

12
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairInputDetails.java
View File

@ -43,11 +43,11 @@ public class RepairInputDetails extends BaseEntity
/** 维修合格数量 */
@Excel(name = "维修合格数量")
private BigDecimal repairNum;
private Integer repairNum;
/** 入库数量 */
@Excel(name = "入库数量")
private BigDecimal inputNum;
private Integer inputNum;
/** 0未审核，1已入库，2驳回 */
@Excel(name = "0未审核，1已入库，2驳回")
@ -112,21 +112,21 @@ public class RepairInputDetails extends BaseEntity
{
return typeId;
}
public void setRepairNum(BigDecimal repairNum)
public void setRepairNum(Integer repairNum)
{
this.repairNum = repairNum;
}
public BigDecimal getRepairNum()
public Integer getRepairNum()
{
return repairNum;
}
public void setInputNum(BigDecimal inputNum)
public void setInputNum(Integer inputNum)
{
this.inputNum = inputNum;
}
public BigDecimal getInputNum()
public Integer getInputNum()
{
return inputNum;
}

4
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ScrapRecord.java
View File

@ -117,7 +117,7 @@ public class ScrapRecord {
*/
@ApiModelProperty(value = "报废数量")
@Excel(name = "报废数量",cellType = Excel.ColumnType.NUMERIC)
private Double scrapNum;
private Integer scrapNum;
/**
* 退料人
@ -204,6 +204,6 @@ public class ScrapRecord {
* 实时库存
*/
@ApiModelProperty(value = "实时库存")
private Double num;
private Integer num;
}

2
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/TeamLeaseInfo.java
View File

@ -81,7 +81,7 @@ public class TeamLeaseInfo {
* 数量
*/
@Excel(name = "出库数量")
private String num;
private Integer num;
/**
* 规格型号id
*/

2
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java
View File

@ -335,7 +335,7 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService
if ("0".equals(maType.getManageType())) { //编码设备
int countOfMachineByTypeId = purchaseMacodeInfoMapper.getCountOfMachineByTypeId(typeId);
maInputRecord.setNum((double) countOfMachineByTypeId);
maInputRecord.setNum(countOfMachineByTypeId);
}
//判断是否是成套机具，是的话配件库存也要增加

8
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java
View File

@ -223,7 +223,7 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
for (RepairAuditDetails inputDetails : repairInputList) {
Long typeId = inputDetails.getTypeId();
Long maId = inputDetails.getMaId();
BigDecimal repairNum = inputDetails.getRepairedNum();
Integer repairNum = inputDetails.getRepairedNum();
// 创建修饰后入库任务
if (repairNum.compareTo(b) > 0) {
// 添加修试后入库任务
@ -321,10 +321,8 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
repairTaskDetails.setTaskId(String.valueOf(inputTaskId));
repairTaskDetails.setMaId(inputDetails.getMaId());
repairTaskDetails.setTypeId(inputDetails.getTypeId());
BigDecimal repairNum = inputDetails.getRepairNum();
/* 直接转换*/
int i = repairNum.intValue();
repairTaskDetails.setRepairNum(i);
Integer repairNum = inputDetails.getRepairNum();
repairTaskDetails.setRepairNum(repairNum);
repairTaskDetails.setStatus("0");
repairTaskDetails.setCreateBy(SecurityUtils.getLoginUser().getUserid());
repairTaskDetails.setCompanyId((long) companyId);

6
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/vo/RepairAuditDetailsVO.java
View File

@ -95,13 +95,13 @@ public class RepairAuditDetailsVO {
/** 维修总量 */
@Excel(name = "维修总量")
private BigDecimal repairNum2;
private Integer repairNum2;
/** 维修数量 */
@Excel(name = "维修数量")
private BigDecimal repairedNum2;
private Integer repairedNum2;
/** 报废数量 */
@Excel(name = "报废数量")
private BigDecimal scrapNum2;
private Integer scrapNum2;
}

2
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/vo/ScrapApplyDetailsVO.java
View File

@ -96,7 +96,7 @@ public class ScrapApplyDetailsVO {
/** 报废数量 */
@Excel(name = "报废数量")
private BigDecimal scrapNum2;
private Integer scrapNum2;
/**