suojin
/
jonhon-mes-svr
23
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

旧MES结算数据生成

Browse Source
liweidong
maxiangong 1 week ago
parent e5beba75f7
commit 60b5b26185
3 changed files with 6 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/entity/OemStatementEntity.java
  2. 2
      blade-service/blade-desk/src/main/java/org/springblade/desk/oem/mapper/OemStatementMapper.xml
  3. 8
      blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/impl/OemStatementServiceImpl.java

2
blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/entity/OemStatementEntity.java
Unescape View File

@ -82,7 +82,7 @@ public class OemStatementEntity extends BaseEntity {
* 镀层厚度 * 镀层厚度
*/ */
@Schema(description = "镀层厚度") @Schema(description = "镀层厚度")
private BigDecimal rosThickness; private String rosThickness;
/** /**
* 结算单价 * 结算单价
*/ */

2
blade-service/blade-desk/src/main/java/org/springblade/desk/oem/mapper/OemStatementMapper.xml
Unescape View File

@ -395,7 +395,7 @@
to_char(d.put_store_time, 'yyyy-MM-dd') as PUT_STORE_DATE, to_char(d.put_store_time, 'yyyy-MM-dd') as PUT_STORE_DATE,
d.make_qty, d.make_qty,
d.make_qty * e.po_area as total_area, d.make_qty * e.po_area as total_area,
TO_NUMBER(p.plate_thickness) as ROS_THICKNESS, p.plate_thickness as ROS_THICKNESS,
p.plate_thickness, p.plate_thickness,
e.plate, e.plate,
e.part_code, e.part_code,

8
blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/impl/OemStatementServiceImpl.java
Unescape View File

@ -1023,7 +1023,7 @@ public class OemStatementServiceImpl extends BaseServiceImpl<OemStatementMapper,
private boolean rulePlateThickness(StatementVO statementVO) { private boolean rulePlateThickness(StatementVO statementVO) {
List<PriceSheetVO> priceSheetList = statementVO.getPriceSheetList(); List<PriceSheetVO> priceSheetList = statementVO.getPriceSheetList();
//结算单的镀层厚度维度分匹配报价的物料号, //结算单的镀层厚度维度分匹配报价的物料号,
String plateThickness = statementVO.getPlateThickness(); String plateThickness = statementVO.getRosThickness();
if (StringUtils.isEmpty(plateThickness)) { if (StringUtils.isEmpty(plateThickness)) {
return false; return false;
} }
@ -1433,7 +1433,7 @@ public class OemStatementServiceImpl extends BaseServiceImpl<OemStatementMapper,
} }
// ====================== 规则3：仅【工序+镀层厚度】，其他null ====================== // ====================== 规则3：仅【工序+镀层厚度】，其他null ======================
for (OemStandardProcessEntity s : allStandardList) { for (OemStandardProcessEntity s : allStandardList) {
boolean rule3 = Objects.equals(s.getProcessId(), statementVO.getPpsId()) && StringUtils.isEmpty(s.getPlate()) && StringUtils.equals(s.getPlateThickness(), statementVO.getPlateThickness()) && StringUtils.isEmpty(s.getPartName()); boolean rule3 = Objects.equals(s.getProcessId(), statementVO.getPpsId()) && StringUtils.isEmpty(s.getPlate()) && StringUtils.equals(s.getPlateThickness(), statementVO.getRosThickness()) && StringUtils.isEmpty(s.getPartName());
if (rule3) return s; if (rule3) return s;
} }
// ====================== 规则4：仅【工序+零件名】，其他null ====================== // ====================== 规则4：仅【工序+零件名】，其他null ======================
@ -1445,7 +1445,7 @@ public class OemStatementServiceImpl extends BaseServiceImpl<OemStatementMapper,
// ====================== 规则5：【工序+镀层厚度+零件名】，镀种null ====================== // ====================== 规则5：【工序+镀层厚度+零件名】，镀种null ======================
for (OemStandardProcessEntity s : allStandardList) { for (OemStandardProcessEntity s : allStandardList) {
boolean rule5 = Objects.equals(s.getProcessId(), statementVO.getPpsId()) && StringUtils.isEmpty(s.getPlate()) && StringUtils.equals(s.getPlateThickness(), statementVO.getPlateThickness()) && StringUtils.equals(s.getPartName(), statementVO.getPartName()); boolean rule5 = Objects.equals(s.getProcessId(), statementVO.getPpsId()) && StringUtils.isEmpty(s.getPlate()) && StringUtils.equals(s.getPlateThickness(), statementVO.getRosThickness()) && StringUtils.equals(s.getPartName(), statementVO.getPartName());
if (rule5) return s; if (rule5) return s;
} }
return null; return null;
@ -2184,7 +2184,7 @@ public class OemStatementServiceImpl extends BaseServiceImpl<OemStatementMapper,
// 镀种 // 镀种
entity.setPlate(vo.getPlate()); entity.setPlate(vo.getPlate());
// 镀层厚度1 // 镀层厚度1
entity.setRosThickness(new BigDecimal(vo.getPlateThickness() != null ? vo.getPlateThickness() : "0")); entity.setRosThickness(vo.getRosThickness());
// 单件面积 // 单件面积
entity.setYpArea(vo.getYpArea() != null ? vo.getYpArea() : BigDecimal.ZERO); entity.setYpArea(vo.getYpArea() != null ? vo.getYpArea() : BigDecimal.ZERO);

Write Preview
Loading…
Cancel
Save