Browse Source

납품서 현황 수정

dwkim 2 years ago
parent
commit
51e91e655e

+ 1 - 0
src/main/java/com/oqpo/api/service/inoutmng/ShmtOdrService.java

@@ -865,6 +865,7 @@ public class ShmtOdrService extends CommonService {
865
                         .dlvQty(m.getDeliDtlMgntInfo() == null ? 0 : m.getDeliDtlMgntInfo().getDlvQty() == null ? 0 : m.getDeliDtlMgntInfo().getDlvQty())
865
                         .dlvQty(m.getDeliDtlMgntInfo() == null ? 0 : m.getDeliDtlMgntInfo().getDlvQty() == null ? 0 : m.getDeliDtlMgntInfo().getDlvQty())
866
                         .unit(m.getDeliDtlMgntInfo() == null ? "" : m.getDeliDtlMgntInfo().getUnit() == null ? "" : m.getDeliDtlMgntInfo().getUnit())
866
                         .unit(m.getDeliDtlMgntInfo() == null ? "" : m.getDeliDtlMgntInfo().getUnit() == null ? "" : m.getDeliDtlMgntInfo().getUnit())
867
                         .unitAmt(m.getDeliDtlMgntInfo() == null ? 0 : m.getDeliDtlMgntInfo().getUnitAmt() == null ? 0 : m.getDeliDtlMgntInfo().getUnitAmt())
867
                         .unitAmt(m.getDeliDtlMgntInfo() == null ? 0 : m.getDeliDtlMgntInfo().getUnitAmt() == null ? 0 : m.getDeliDtlMgntInfo().getUnitAmt())
868
+                        .dlvAmt(m.getDeliDtlMgntInfo() == null ? 0 : m.getDeliDtlMgntInfo().getDlvAmt() == null ? 0 : m.getDeliDtlMgntInfo().getDlvAmt())
868
                         .dlvMgrNm(m.getDlvMgrNm() == null ? "" : m.getDlvMgrNm())
869
                         .dlvMgrNm(m.getDlvMgrNm() == null ? "" : m.getDlvMgrNm())
869
                         .dlvMgrTelNo(m.getDlvMgrTelNo() == null ? "" : m.getDlvMgrTelNo())
870
                         .dlvMgrTelNo(m.getDlvMgrTelNo() == null ? "" : m.getDlvMgrTelNo())
870
                         .build())
871
                         .build())

+ 2 - 1
src/main/java/com/oqpo/api/web/dto/response/inoutmng/DeliDtlSearchListResponse.java

@@ -36,7 +36,8 @@ public class DeliDtlSearchListResponse {
36
     @ApiModelProperty(value = "발주금액") private Integer podrQty;
36
     @ApiModelProperty(value = "발주금액") private Integer podrQty;
37
     @ApiModelProperty(value = "납품/수주 수량") private Integer dlvQty;
37
     @ApiModelProperty(value = "납품/수주 수량") private Integer dlvQty;
38
     @ApiModelProperty(value = "단위") private String unit;
38
     @ApiModelProperty(value = "단위") private String unit;
39
-    @ApiModelProperty(value = "납품금액") private Long unitAmt;
39
+    @ApiModelProperty(value = "납품단가") private Long unitAmt;
40
+    @ApiModelProperty(value = "납품금액") private Long dlvAmt;
40
     @ApiModelProperty(value = "납품담당자명") private String dlvMgrNm;
41
     @ApiModelProperty(value = "납품담당자명") private String dlvMgrNm;
41
     @ApiModelProperty(value = "납품담당자연락처") private String dlvMgrTelNo;
42
     @ApiModelProperty(value = "납품담당자연락처") private String dlvMgrTelNo;
42
 
43
 

+ 1 - 1
src/main/resources/mybatis/sqlmaps/inoutmng/ShmtOdr.xml

@@ -464,7 +464,7 @@
464
         , ptcl.item_id as 'deliDtlMgntInfo.item_id', ptcl.item_nm as 'deliDtlMgntInfo.item_nm'
464
         , ptcl.item_id as 'deliDtlMgntInfo.item_id', ptcl.item_nm as 'deliDtlMgntInfo.item_nm'
465
         , ptcl.podr_qty as 'deliDtlMgntInfo.podr_qty', ptcl.dlv_qty as 'deliDtlMgntInfo.dlv_qty'
465
         , ptcl.podr_qty as 'deliDtlMgntInfo.podr_qty', ptcl.dlv_qty as 'deliDtlMgntInfo.dlv_qty'
466
         , ptcl.unit as 'deliDtlMgntInfo.unit', ptcl.unit_amt as 'deliDtlMgntInfo.unit_amt'
466
         , ptcl.unit as 'deliDtlMgntInfo.unit', ptcl.unit_amt as 'deliDtlMgntInfo.unit_amt'
467
-        , info.dlv_mgr_nm , info.dlv_mgr_tel_no
467
+        , info.dlv_mgr_nm , fn_get_telno(info.dlv_mgr_tel_no) as dlv_mgr_tel_no, ptcl.dlv_amt as 'deliDtlMgntInfo.dlv_amt'
468
         from deli_info_mgnt info
468
         from deli_info_mgnt info
469
         , deli_dtl_ptcl ptcl
469
         , deli_dtl_ptcl ptcl
470
         where 1 = 1
470
         where 1 = 1