rakor
/
nflg_project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

【物料主数据】 

1、物料变更详情，增加原物料状态字段
2、hana最近采购价格公式修改
This commit is contained in:
10001392 2024-10-08 17:05:57 +08:00
parent 9e83b3ab31
commit 22bd790f3d
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/vo/MaterialMainVO.java
View File

@ -473,5 +473,16 @@ public class MaterialMainVO implements Serializable {
@ApiModelProperty(value = "变更生效时间") @ApiModelProperty(value = "变更生效时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date updateEffectTime; private Date updateEffectTime;
/**
* 旧物料状态 1:正常 2:禁止采购 3:售后专用 4:冻结 5:完全弃用
*/
@ApiModelProperty(value = "旧物料状态 1:正常(激活) 2:禁止采购 3:售后专用 4:禁用(冻结) 5:完全弃用")
@ExcelColumn("旧物料状态 1:禁用 0：启用")
private Integer oldMaterialState;
@ApiModelProperty(value = "旧物料状态名称")
@ExcelColumn("旧物料状态名称")
private Integer oldMaterialStateName;
// 变更弹窗字段 end // 变更弹窗字段 end
} }

2
nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialMainService.java
View File

@ -1914,7 +1914,7 @@ public class MaterialMainService extends ServiceImpl<MaterialMainMapper, Materia
sql2 = sql2.concat("( select matnr, max(BEDAT) maxBEDAT from SAPABAP1.\"/BIC/AZSD_E00042\" where 1=1 and matnr in (").concat(whrMaterials).concat(")").concat(" and BSART = 'NB' "); sql2 = sql2.concat("( select matnr, max(BEDAT) maxBEDAT from SAPABAP1.\"/BIC/AZSD_E00042\" where 1=1 and matnr in (").concat(whrMaterials).concat(")").concat(" and BSART = 'NB' ");
sql2 = sql2.concat("group by matnr ) a"); sql2 = sql2.concat("group by matnr ) a");
sql2 = sql2.concat(" left join"); sql2 = sql2.concat(" left join");
sql2 = sql2.concat(" ( select matnr, BEDAT,BRTWR,MENGE,PEINH , case when MENGE = 0 or PEINH = 0 then 0 else BRTWR/(MENGE*PEINH) end as purPrice from SAPABAP1.\"/BIC/AZSD_E00042\" where 1=1 and matnr in (").concat(whrMaterials).concat(") and BSART = 'NB' )b"); sql2 = sql2.concat(" ( select matnr, BEDAT,BRTWR,MENGE,PEINH , case when MENGE = 0 or PEINH = 0 then 0 else BRTWR/MENGE end as purPrice from SAPABAP1.\"/BIC/AZSD_E00042\" where 1=1 and matnr in (").concat(whrMaterials).concat(") and BSART = 'NB' )b");
sql2 = sql2.concat(" on a.matnr = b.matnr and a.maxBEDAT = b.BEDAT"); sql2 = sql2.concat(" on a.matnr = b.matnr and a.maxBEDAT = b.BEDAT");
log.info("获取SAP最近采购价格"); log.info("获取SAP最近采购价格");

1
nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialUpdateBillService.java
View File

@ -1057,6 +1057,7 @@ public class MaterialUpdateBillService extends ServiceImpl<MaterialUpdateBillMap
materialMainVO.setOutAttrs(outAttrs); materialMainVO.setOutAttrs(outAttrs);
} }
materialMainVO.setMaterialState(materialUpdateBillEntity.getNewMaterialState()); materialMainVO.setMaterialState(materialUpdateBillEntity.getNewMaterialState());
materialMainVO.setOldMaterialState(materialUpdateBillEntity.getOldMaterialState());
if (StringUtils.isEmpty(materialUpdateBillEntity.getUpdateResion())) { if (StringUtils.isEmpty(materialUpdateBillEntity.getUpdateResion())) {
materialMainVO.setUpdateResion(""); materialMainVO.setUpdateResion("");
} else { } else {