dev

src/main/java/com/its/op/dto/its/facility/TbFcltSubjPartDto.java

@@ -36,6 +36,10 @@ public class TbFcltSubjPartDto implements Serializable {
     @JsonProperty("part_nm")
     private String partNm;
 
+    @ApiModelProperty("부품단위")  // Y VARCHAR2(10)
+    @JsonProperty("part_unit")
+    private String partUnit;
+
     @ApiModelProperty("부품 세부사양")  // Y VARCHAR2(100)
     @JsonProperty("part_detl")
     private String partDetl;
@@ -84,6 +88,11 @@ public class TbFcltSubjPartDto implements Serializable {
         @Size(min=1, max=100)
         private String partNm;
 
+        @ApiModelProperty("부품단위, Nullable = Y, VARCHAR2(10)")
+        @JsonProperty("part_unit")
+        @Size(max=10)
+        private String partUnit;
+
         @ApiModelProperty("부품 세부사양, Nullable = Y, VARCHAR2(100)")  // Y VARCHAR2(100)
         @JsonProperty("part_detl")
         @Size(max=100)
@@ -106,11 +115,12 @@ public class TbFcltSubjPartDto implements Serializable {
         private String delYn;
 
         @Builder
-        public TbFcltSubjPartUpdReq(Long part_nmbr, Long subj_nmbr, Integer part_id, String part_nm, String part_detl, Integer valid_mn, Integer valid_cnt, String del_yn) {
+        public TbFcltSubjPartUpdReq(Long part_nmbr, Long subj_nmbr, Integer part_id, String part_nm, String part_unit, String part_detl, Integer valid_mn, Integer valid_cnt, String del_yn) {
             this.partNmbr = part_nmbr;
             this.subjNmbr = subj_nmbr;
             this.partId = part_id;
             this.partNm = part_nm;
+            this.partUnit = part_unit;
             this.partDetl = part_detl;
             this.validMn = valid_mn;
             this.validCnt = valid_cnt;
@@ -123,6 +133,7 @@ public class TbFcltSubjPartDto implements Serializable {
                     .subjNmbr(this.subjNmbr)
                     .partId(this.partId)
                     .partNm(this.partNm)
+                    .partUnit(this.partUnit)
                     .partDetl(this.partDetl)
                     .validMn(this.validMn)
                     .validCnt(this.validCnt)

src/main/java/com/its/op/entity/its/facility/TbFcltSubjPart.java

@@ -44,6 +44,11 @@ public class TbFcltSubjPart implements Serializable {
     @Column(name = "PART_NM", length = 100)
     private String partNm;
 
+    @ApiModelProperty("부품 단위(EA, ...)")  // Y VARCHAR2(10)
+    @Column(name = "PART_UNIT", length = 10)
+    private String partUnit;
+    @ApiModelProperty("부품 세부사양")  // Y VARCHAR2(100)
+
     @Column(name = "PART_DETL", length = 100)
     private String partDetl;
 
@@ -65,6 +70,7 @@ public class TbFcltSubjPart implements Serializable {
                 .subjNmbr(this.subjNmbr)
                 .partId(this.partId)
                 .partNm(this.partNm)
+                .partUnit(this.partUnit)
                 .partDetl(this.partDetl)
                 .validMn(this.validMn)
                 .validCnt(this.validCnt)
@@ -80,6 +86,7 @@ public class TbFcltSubjPart implements Serializable {
         this.subjNmbr = req.getSubjNmbr();
         this.partId = req.getPartId();
         this.partNm = req.getPartNm();
+        this.partUnit = req.getPartUnit();
         this.partDetl = req.getPartDetl();
         this.validMn = req.getValidMn();
         this.validCnt = req.getValidCnt();

src/main/java/com/its/op/service/its/scrs/TbScIxrCmraMngmService.java

@@ -159,7 +159,7 @@ public class TbScIxrCmraMngmService {
         HashMap<String, ScIxrCmraTfvlDto> tfvlMap = new HashMap<>();
         List<ScIxrCmraTfvlDto> tfvlList = this.tfvlMapper.findIxtTfvlToday();
         tfvlList.forEach(tfvl -> {
-            tfvlMap.put(tfvl.getIxrId(), tfvl);
+            tfvlMap.put(tfvl.getCmraId(), tfvl);
         });
 
         List<FcltSttsDto> sttsDtoList = new ArrayList<>();
@@ -180,7 +180,7 @@ public class TbScIxrCmraMngmService {
             TbScIxrCmraSttsDto dto = obj.toSttsDto();
             if (total) {
                 int tfvl = 0;
-                ScIxrCmraTfvlDto tfvlDto = tfvlMap.get(obj.getIxrId());
+                ScIxrCmraTfvlDto tfvlDto = tfvlMap.get(obj.getCmraId());
                 if (tfvlDto != null) {
                     tfvl = tfvlDto.getTfvl();
                 }