dwkim 2 years ago
parent
commit
6d936e5b17
25 changed files with 55 additions and 47 deletions
  1. 4 4
      src/main/java/com/oqpo/api/entity/inoutmng/DeliDtlMgntEntity.java
  2. 1 1
      src/main/java/com/oqpo/api/entity/inoutmng/DeliInfoMgntEntity.java
  3. 1 1
      src/main/java/com/oqpo/api/entity/inoutmng/ShmtOdrBaseEntity.java
  4. 3 3
      src/main/java/com/oqpo/api/entity/inoutmng/ShmtOdrDtlEntity.java
  5. 1 1
      src/main/java/com/oqpo/api/entity/pomng/PchOdrBaseInfoEntity.java
  6. 3 2
      src/main/java/com/oqpo/api/entity/pomng/PchOdrDtlPtclEntity.java
  7. 1 1
      src/main/java/com/oqpo/api/entity/pomng/WhsProcInfoEntity.java
  8. 1 1
      src/main/java/com/oqpo/api/entity/stockmng/WhsProcInfoPtclEntity.java
  9. 1 1
      src/main/java/com/oqpo/api/enums/DataMessageCode.java
  10. 3 3
      src/main/java/com/oqpo/api/service/inoutmng/ShmtOdrService.java
  11. 11 5
      src/main/java/com/oqpo/api/service/pomng/PchOrdService.java
  12. 1 1
      src/main/java/com/oqpo/api/web/dto/request/pomng/pchOrd/CancelPchOrdDtlRequest.java
  13. 0 1
      src/main/java/com/oqpo/api/web/dto/request/pomng/pchOrd/PchReqOrdInitRequest.java
  14. 1 1
      src/main/java/com/oqpo/api/web/dto/response/inoutmng/DeliDtlSearchListResponse.java
  15. 2 2
      src/main/java/com/oqpo/api/web/dto/response/inoutmng/ShmtOdrSearchListResponse.java
  16. 2 2
      src/main/java/com/oqpo/api/web/dto/response/inoutmng/ShmtOutSearchListResponse.java
  17. 1 1
      src/main/java/com/oqpo/api/web/dto/response/inoutmng/SpplyInvInitResponse.java
  18. 2 2
      src/main/java/com/oqpo/api/web/dto/response/inoutmng/SpplyTargerOdrSearchListResponse.java
  19. 2 2
      src/main/java/com/oqpo/api/web/dto/response/inoutmng/WarehouseTargetResponse.java
  20. 3 3
      src/main/java/com/oqpo/api/web/dto/response/pomng/pchOrd/PchOdrInfoResponse.java
  21. 1 1
      src/main/java/com/oqpo/api/web/dto/response/pomng/pchOrd/PchOdrSearchListResponse.java
  22. 4 3
      src/main/java/com/oqpo/api/web/dto/response/pomng/pchOrd/PchOrdInitInfoResponse.java
  23. 3 3
      src/main/java/com/oqpo/api/web/dto/response/pomng/pchOrd/SpplyPchOdrInfoResponse.java
  24. 1 1
      src/main/java/com/oqpo/api/web/dto/response/pomng/pchOrd/SpplyPoOdrSearchListResponse.java
  25. 2 1
      src/main/resources/mybatis/sqlmaps/pomng/PchOrd.xml

+ 4 - 4
src/main/java/com/oqpo/api/entity/inoutmng/DeliDtlMgntEntity.java

@@ -21,12 +21,12 @@ public class DeliDtlMgntEntity implements Serializable {
21 21
     private String itemId;
22 22
     private String itemNm;
23 23
     private String unit;
24
-    private Integer unitAmt;
24
+    private Long unitAmt;
25 25
     private String priceUnit;
26 26
     private Integer podrQty;
27 27
     private Integer dlvQty;
28
-    private Integer podrAmt;
29
-    private Integer dlvAmt;
28
+    private Long podrAmt;
29
+    private Long dlvAmt;
30 30
     private String expryDate;
31 31
     private String delayYn;
32 32
     private String delayRsn;
@@ -35,7 +35,7 @@ public class DeliDtlMgntEntity implements Serializable {
35 35
     private String sysChgDttm;
36 36
     private String sysChgId;
37 37
     private Integer whsQty;
38
-    private Integer whsAmt;
38
+    private Long whsAmt;
39 39
     private String shmtReqUnqNo;
40 40
     private String shmtReqDtlNo;
41 41
     private String dlvDtlStCd;

+ 1 - 1
src/main/java/com/oqpo/api/entity/inoutmng/DeliInfoMgntEntity.java

@@ -16,7 +16,7 @@ public class DeliInfoMgntEntity implements Serializable {
16 16
     private String spplyId;
17 17
     private String spplyNm;
18 18
     private String dlvRegDt;
19
-    private Integer dlvAmt;
19
+    private Long dlvAmt;
20 20
     private String dlvMgrNm;
21 21
     private String dlvMgrTelNo;
22 22
     private String dlvMgrEmal;

+ 1 - 1
src/main/java/com/oqpo/api/entity/inoutmng/ShmtOdrBaseEntity.java

@@ -33,7 +33,7 @@ public class ShmtOdrBaseEntity implements Serializable {
33 33
     private String podrDvsn;
34 34
     private String podrDvsnNm;
35 35
     private Integer itemQty;
36
-    private Integer shmtTotalAmt;
36
+    private Long shmtTotalAmt;
37 37
     private String podrMgrNm;
38 38
     private String dlvReqDt;
39 39
     private String whsId;

+ 3 - 3
src/main/java/com/oqpo/api/entity/inoutmng/ShmtOdrDtlEntity.java

@@ -16,13 +16,13 @@ public class ShmtOdrDtlEntity implements Serializable {
16 16
     private String shmtReqDtlNo;
17 17
     private String itemId;
18 18
     private String itemNm;
19
-    private Integer unitAmt;
19
+    private Long unitAmt;
20 20
     private String unit;
21 21
     private String unitNm;
22 22
     private Integer podrQty;
23
-    private Integer podrAmt;
23
+    private Long podrAmt;
24 24
     private Integer shmtQty;
25
-    private Integer shmtAmt;
25
+    private Long shmtAmt;
26 26
     private String expryDate;
27 27
     private String pchPodrUnqNo;
28 28
     private String pchPodrDtlNo;

+ 1 - 1
src/main/java/com/oqpo/api/entity/pomng/PchOdrBaseInfoEntity.java

@@ -19,7 +19,7 @@ public class PchOdrBaseInfoEntity implements Serializable {
19 19
     private String brandNm;
20 20
     private String pchReqDvsn;
21 21
     private String pchReqDvsnNm;
22
-    private Integer podrTotalAmt;
22
+    private Long podrTotalAmt;
23 23
     private String dlvPlace;
24 24
     private String dlvPlaceDtl;
25 25
     private String dlvDvsn;

+ 3 - 2
src/main/java/com/oqpo/api/entity/pomng/PchOdrDtlPtclEntity.java

@@ -19,7 +19,7 @@ public class PchOdrDtlPtclEntity implements Serializable {
19 19
     private String itemId;
20 20
     private String itemNm;
21 21
     private Integer podrQty;
22
-    private Integer podrAmt;
22
+    private Long podrAmt;
23 23
     private String curr;
24 24
     private String currNm;
25 25
     private String unit;
@@ -27,7 +27,7 @@ public class PchOdrDtlPtclEntity implements Serializable {
27 27
     private String priceUnit;
28 28
     private String priceUnitNm;
29 29
     private String dlvReqDt;
30
-    private Integer unitAmt;
30
+    private Long unitAmt;
31 31
     private String dlvSchDt;
32 32
     private Integer shmtPssblQty;
33 33
     private String sysRegDttm;
@@ -42,6 +42,7 @@ public class PchOdrDtlPtclEntity implements Serializable {
42 42
     private String spplyNm;
43 43
     private String brandUnitUnqNo;
44 44
     private String storeUnitUnqNo;
45
+    private Long pchReqAmt;
45 46
 
46 47
     private String podrDtlStCd;
47 48
     private String podrDtlStNm;

+ 1 - 1
src/main/java/com/oqpo/api/entity/pomng/WhsProcInfoEntity.java

@@ -37,7 +37,7 @@ public class WhsProcInfoEntity implements Serializable {
37 37
     private String dlvMgrMblNo;
38 38
     private String itemId;
39 39
     private String itemNm;
40
-    private Integer whsAmt;
40
+    private Long whsAmt;
41 41
     private String whsDlvChrg;
42 42
     private String dlvMgrId;
43 43
     private String dlvCnfmDocFileNo;

+ 1 - 1
src/main/java/com/oqpo/api/entity/stockmng/WhsProcInfoPtclEntity.java

@@ -43,7 +43,7 @@ public class WhsProcInfoPtclEntity implements Serializable {
43 43
     @ApiModelProperty(value = "창고구분명")
44 44
     private String whsDvsnNm;
45 45
     @ApiModelProperty(value = "단가")
46
-    private Integer unitAmt;
46
+    private Long unitAmt;
47 47
     @ApiModelProperty(value = "발주수량")
48 48
     private Integer podrQty;
49 49
     @ApiModelProperty(value = "납품수량")

+ 1 - 1
src/main/java/com/oqpo/api/enums/DataMessageCode.java

@@ -8,7 +8,7 @@ public enum DataMessageCode {
8 8
     DUPLICATE_YES ("Y", "사용 할 수 없는 아이디 입니다."),
9 9
     DUPLICATE_CODE_NO ("N", "사용 가능한 코드 입니다."),
10 10
     DUPLICATE_CODE_YES ("Y", "사용 할 수 없는 코드 입니다."),
11
-    OK_PCHORD ("Y", "발주 생성 가능합니다."),
11
+    OK_PCHORD ("Y", ""),  //발주 생성 가능합니다.
12 12
     NOT_NEQWHSID ("N", "동일한 납품장소로 발주를 진행해야 합니다.!"),
13 13
     NOT_NEQSPPLY ("N", "동일한 공급사로 발주를 진행해야 합니다.!"),
14 14
     NOT_NEQDLVDT ("N", "동일한 납품요청일로 발주를 진행해야 합니다.!"),

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

@@ -144,7 +144,7 @@ public class ShmtOdrService extends CommonService {
144 144
             String shmtWhsId = "";
145 145
             String shmtLocation = "";
146 146
             int itemQty = 0;
147
-            int shmtTotalAmt = 0;
147
+            long shmtTotalAmt = 0;
148 148
             String expryDate = "";
149 149
             int shmtQty = 0;
150 150
             String shmtReqUnqNo = "";
@@ -638,12 +638,12 @@ public class ShmtOdrService extends CommonService {
638 638
 
639 639
             List<PchOdrDtlPtclEntity> gridInsertData = saveSpplyDlvRequest.toCodeEntities(saveSpplyDlvRequest.getGridInsertData());
640 640
             List<PchOdrBaseInfoEntity> jobList = shmtOdrMapper.selectShmtJobDataList(saveSpplyDlvRequest.getBrandId(), gridInsertData);
641
-            int shmtTotalAmt = 0;
641
+            long shmtTotalAmt = 0;
642 642
             String expryDate = "";
643 643
             int shmtQty = 0;
644 644
             String dlvSttmtUnqNo = "";
645 645
             String storeId = "" ;
646
-            int chgLoanAmt = 0 ;
646
+            long chgLoanAmt = 0 ;
647 647
 
648 648
             DeliInfoMgntEntity deliBaseEntity = new DeliInfoMgntEntity();
649 649
             List<DeliDtlMgntEntity> deliDtlList = new ArrayList<DeliDtlMgntEntity>();

+ 11 - 5
src/main/java/com/oqpo/api/service/pomng/PchOrdService.java

@@ -152,7 +152,7 @@ public class PchOrdService extends CommonService {
152 152
         }
153 153
 
154 154
         PchOdrBaseInfoEntity headData =  headList.get(0);
155
-        int podrTotalAmt = 0 ; // 총 발주금액
155
+        long podrTotalAmt = 0 ; // 총 발주금액
156 156
         String dlvReqDt = ""; // 납품요청일
157 157
         String spplyId = ""; // 공급업체
158 158
         String spplyNm = ""; //공급업체명
@@ -168,7 +168,9 @@ public class PchOrdService extends CommonService {
168 168
                 PchOdrDtlPtclEntity itemInfo = itemList.get(j);
169 169
                 podrTotalAmt = podrTotalAmt + (itemInfo.getUnitAmt() * itemInfo.getPchReqQty());
170 170
                 if ("".equals(dlvReqDt)) {
171
+                   // System.out.println(" before==dlvReqDt===================>" + dlvReqDt);
171 172
                     dlvReqDt = itemInfo.getDlvReqDt();
173
+                   // System.out.println(" after==dlvReqDt===================>" + dlvReqDt);
172 174
                 } else {
173 175
                     if (!dlvReqDt.equals(itemInfo.getDlvReqDt())) {
174 176
                         throw new GlobalException(SystemMessageCode.ERR_NEQDLVDT);
@@ -191,12 +193,16 @@ public class PchOrdService extends CommonService {
191 193
                 if ("".equals(spplyId)) {
192 194
                     throw new GlobalException(SystemMessageCode.ERR_NONSPPLY);
193 195
                 }
196
+
197
+                dlvReqDt = itemInfo.getDlvReqDt();
194 198
             }
195 199
         }
196
-
200
+       // System.out.println(" last==dlvReqDt===================>" + dlvReqDt);
197 201
         headData.setSpplyId(spplyId);
198 202
         headData.setSpplyNm(spplyNm);
199 203
         headData.setPodrTotalAmt(podrTotalAmt);
204
+        headData.setDlvReqDt(dlvReqDt);
205
+       // System.out.println(" headData==dlvReqDt===================>" + headData.getDlvReqDt());
200 206
 
201 207
 
202 208
         return PchOrdInitInfoResponse.toDTO(uEntity, headData, itemList);
@@ -259,7 +265,7 @@ public class PchOrdService extends CommonService {
259 265
 
260 266
             List<PchReqBaseInfoEntity> pchReqList = new ArrayList<PchReqBaseInfoEntity>();
261 267
             if (gridUpdateData.size() > 0) {
262
-                int poTotAmt = 0 ;
268
+                long poTotAmt = 0 ;
263 269
                 int poItemCnt = 0 ;
264 270
                 String  diffSpplyYn = "N" ;
265 271
                 for (int i = 0 ; i < gridUpdateData.size() ;i++ ) {
@@ -290,7 +296,7 @@ public class PchOrdService extends CommonService {
290 296
                     poSaveDtlEntity.setPchReqUnqNo(poDtlEntity.getPchReqUnqNo());
291 297
                     poSaveDtlEntity.setPchReqDtlNo(poDtlEntity.getPchReqDtlNo());
292 298
                     poSaveDtlEntity.setPodrQty(poDtlEntity.getPodrQty());
293
-                    poSaveDtlEntity.setPodrAmt(poDtlEntity.getPodrQty() * poSaveDtlEntity.getUnitAmt() );
299
+                    poSaveDtlEntity.setPodrAmt(Long.valueOf(poDtlEntity.getPodrQty()) * poSaveDtlEntity.getUnitAmt() );
294 300
                     poSaveDtlEntity.setCurr("KRW");
295 301
                     poSaveDtlEntity.setPodrDtlStCd("POD0");
296 302
                     poSaveDtlEntity.setBrandUnitUnqNo(poDtlEntity.getBrandUnitUnqNo());
@@ -429,7 +435,7 @@ public class PchOrdService extends CommonService {
429 435
     public void cancelPchOrdDtl(String userId, CancelPchOrdDtlRequest cancelPchOrdDtlRequest) throws Exception {
430 436
         try {
431 437
             // 품목 삭제 상태처리
432
-            Integer podrAmt = 0 ;
438
+            long podrAmt = 0;
433 439
             List<PchOdrDtlPtclEntity> gridUpdateData = cancelPchOrdDtlRequest.toCodeEntities(cancelPchOrdDtlRequest.getGridUpdateData());
434 440
             List<StckMgntBaseInfoEntity> stckList = new ArrayList<StckMgntBaseInfoEntity>();
435 441
             if (gridUpdateData.size() > 0) {

+ 1 - 1
src/main/java/com/oqpo/api/web/dto/request/pomng/pchOrd/CancelPchOrdDtlRequest.java

@@ -67,6 +67,6 @@ public class CancelPchOrdDtlRequest {
67 67
         @ApiModelProperty(value = "구매요청상세번호") private String pchPodrDtlNo;
68 68
         @ApiModelProperty(value = "품목아이디") private String itemId;
69 69
         @ApiModelProperty(value = "발주수량") private Integer podrQty;
70
-        @ApiModelProperty(value = "발주 금액") private Integer podrAmt;
70
+        @ApiModelProperty(value = "발주 금액") private Long podrAmt;
71 71
     }
72 72
 }

+ 0 - 1
src/main/java/com/oqpo/api/web/dto/request/pomng/pchOrd/PchReqOrdInitRequest.java

@@ -12,7 +12,6 @@ import java.util.List;
12 12
 @Setter
13 13
 public class PchReqOrdInitRequest {
14 14
 
15
-    @NotBlank
16 15
     @ApiModelProperty(value = "CRUD")
17 16
     private String viewCd;
18 17
 

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

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

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

@@ -23,14 +23,14 @@ public class ShmtOdrSearchListResponse {
23 23
     @ApiModelProperty(value = "납품창고아이디") private String whsId;
24 24
     @ApiModelProperty(value = "납품창고명") private String whsNm;
25 25
     @ApiModelProperty(value = "납품LOCATION") private String location;
26
-    @ApiModelProperty(value = "단가") private Integer unitAmt;
26
+    @ApiModelProperty(value = "단가") private Long unitAmt;
27 27
     @ApiModelProperty(value = "발주수량") private Integer podrQty;
28 28
     @ApiModelProperty(value = "출고수량") private Integer shmtQty;
29 29
     @ApiModelProperty(value = "현 재고") private Integer stckQty;
30 30
     @ApiModelProperty(value = "유통기한여부") private String expryYn;
31 31
     @ApiModelProperty(value = "유통기한기간") private Integer expryPeriod;
32 32
     @ApiModelProperty(value = "유통일자") private String expryDate;
33
-    @ApiModelProperty(value = "발주금액") private Integer podrAmt;
33
+    @ApiModelProperty(value = "발주금액") private Long podrAmt;
34 34
     @ApiModelProperty(value = "납품요청일") private String dlvReqDt;
35 35
     @ApiModelProperty(value = "출고창고아이디") private String shmtWhsId;
36 36
     @ApiModelProperty(value = "출고LOCATION") private String shmtLocation;

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

@@ -28,9 +28,9 @@ public class ShmtOutSearchListResponse {
28 28
     @ApiModelProperty(value = "납품창고명") private String whsNm;
29 29
     @ApiModelProperty(value = "납품LOCATION") private String location;
30 30
     @ApiModelProperty(value = "출고수량") private Integer shmtQty;
31
-    @ApiModelProperty(value = "출고금액") private Integer shmtAmt;
31
+    @ApiModelProperty(value = "출고금액") private Long shmtAmt;
32 32
     @ApiModelProperty(value = "입고수량") private Integer whsQty;
33
-    @ApiModelProperty(value = "입고금액") private Integer whsAmt;
33
+    @ApiModelProperty(value = "입고금액") private Long whsAmt;
34 34
     @ApiModelProperty(value = "입고일자") private String whsDt;
35 35
     @ApiModelProperty(value = "입고담당자") private String whsCnfmNm;
36 36
     @ApiModelProperty(value = "납품서번호") private String dlvSttmtUnqNo;

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

@@ -23,7 +23,7 @@ public class SpplyInvInitResponse {
23 23
     @ApiModelProperty(value = "브랜드아이디") private String brandId;
24 24
     @ApiModelProperty(value = "브랜드명") private String brandNm;
25 25
     @ApiModelProperty(value = "납품서생성일") private String dlvReqDt;
26
-    @ApiModelProperty(value = "납품총금액") private Integer podrTotalAmt;  // dlv_mgr_tel_no
26
+    @ApiModelProperty(value = "납품총금액") private Long podrTotalAmt;  // dlv_mgr_tel_no
27 27
     @ApiModelProperty(value = "납품창고아이디") private String whsId;
28 28
     @ApiModelProperty(value = "납품찿고명") private String whsNm;
29 29
     @ApiModelProperty(value = "location") private String location;

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

@@ -23,9 +23,9 @@ public class SpplyTargerOdrSearchListResponse {
23 23
     @ApiModelProperty(value = "납품창고아이디") private String whsId;
24 24
     @ApiModelProperty(value = "납품창고명") private String whsNm;
25 25
     @ApiModelProperty(value = "납품LOCATION") private String location;
26
-    @ApiModelProperty(value = "단가") private Integer unitAmt;
26
+    @ApiModelProperty(value = "단가") private Long unitAmt;
27 27
     @ApiModelProperty(value = "발주수량") private Integer podrQty;
28
-    @ApiModelProperty(value = "발주금액") private Integer podrAmt;
28
+    @ApiModelProperty(value = "발주금액") private Long podrAmt;
29 29
     @ApiModelProperty(value = "납품요청일") private String dlvReqDt;
30 30
 
31 31
 }

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

@@ -23,8 +23,8 @@ public class WarehouseTargetResponse {
23 23
     @ApiModelProperty(value = "발주금액") private Integer podrQty;
24 24
     @ApiModelProperty(value = "납품/수주 수량") private Integer dlvQty;
25 25
     @ApiModelProperty(value = "입고 수량") private Integer whsQty;
26
-    @ApiModelProperty(value = "입고금액") private Integer whsAmt;
27
-    @ApiModelProperty(value = "단가") private Integer unitAmt;
26
+    @ApiModelProperty(value = "입고금액") private Long whsAmt;
27
+    @ApiModelProperty(value = "단가") private Long unitAmt;
28 28
     @ApiModelProperty(value = "납품창고아이디") private String whsId;
29 29
     @ApiModelProperty(value = "납품LOCATION") private String location;
30 30
     @ApiModelProperty(value = "납품창고명") private String whsNm;

+ 3 - 3
src/main/java/com/oqpo/api/web/dto/response/pomng/pchOrd/PchOdrInfoResponse.java

@@ -31,7 +31,7 @@ public class PchOdrInfoResponse {
31 31
     @ApiModelProperty(value = "발주일자") private String podrDt;
32 32
     @ApiModelProperty(value = "납품창고") private String whsDvsnNm;
33 33
     @ApiModelProperty(value = "출고창고") private String shmtWhsDvsnNm;
34
-    @ApiModelProperty(value = "발주합계금액") private Integer podrTotalAmt;
34
+    @ApiModelProperty(value = "발주합계금액") private Long podrTotalAmt;
35 35
     @ApiModelProperty(value = "발주품목수량") private Integer podrItemQty;
36 36
     @ApiModelProperty(value = "발주담당자명") private String podrMgrNm;
37 37
     @ApiModelProperty(value = "발주담당자전화번호") private String podrMgrTelNo;
@@ -89,9 +89,9 @@ public class PchOdrInfoResponse {
89 89
         @ApiModelProperty(value = "품목아이디") private String itemId;
90 90
         @ApiModelProperty(value = "품목명") private String itemNm;
91 91
         @ApiModelProperty(value = "발주수량") private Integer podrQty;
92
-        @ApiModelProperty(value = "발주금액") private Integer podrAmt;
92
+        @ApiModelProperty(value = "발주금액") private Long podrAmt;
93 93
         @ApiModelProperty(value = "단위") private String unit;
94
-        @ApiModelProperty(value = "단가금액") private Integer unitAmt;
94
+        @ApiModelProperty(value = "단가금액") private Long unitAmt;
95 95
         @ApiModelProperty(value = "출고가능수량") private Integer whsPassQty;
96 96
         @ApiModelProperty(value = "발주상세코드") private String podrDtlStCd;
97 97
         @ApiModelProperty(value = "발주상세명") private String podrDtlStNm;

+ 1 - 1
src/main/java/com/oqpo/api/web/dto/response/pomng/pchOrd/PchOdrSearchListResponse.java

@@ -24,7 +24,7 @@ public class PchOdrSearchListResponse {
24 24
     @ApiModelProperty(value = "납품LOCATION명") private String locationNm;
25 25
     @ApiModelProperty(value = "공급사아이디") private String spplyId;
26 26
     @ApiModelProperty(value = "공급사명") private String spplyNm;
27
-    @ApiModelProperty(value = "발주합계금액") private Integer podrTotalAmt;
27
+    @ApiModelProperty(value = "발주합계금액") private Long podrTotalAmt;
28 28
     @ApiModelProperty(value = "발주품목수량") private Integer podrItemQty;
29 29
     @ApiModelProperty(value = "발주담당자명") private String podrMgrNm;
30 30
     @ApiModelProperty(value = "출하창고명") private String shmtWhsNm;

+ 4 - 3
src/main/java/com/oqpo/api/web/dto/response/pomng/pchOrd/PchOrdInitInfoResponse.java

@@ -36,6 +36,7 @@ public class PchOrdInitInfoResponse {
36 36
     @ApiModelProperty(value = "배송구분코드") private String dlvDvsn;
37 37
     @ApiModelProperty(value = "배송구분명") private String dlvDvsnNm;
38 38
     @ApiModelProperty(value = "발주총금액") private long podrTotalAmt;
39
+    @ApiModelProperty(value = "납품요청일") private String dlvReqDt;
39 40
     @ApiModelProperty(value = "출하창고아이디") private String shmtWhsId;
40 41
     @ApiModelProperty(value = "출하창고명") private String shmtWhsNm;
41 42
     @ApiModelProperty(value = "츨히location") private String shmtLocation;
@@ -62,6 +63,7 @@ public class PchOrdInitInfoResponse {
62 63
                 .dlvDvsn(baseEntity.getDlvDvsn() == null ? "" : baseEntity.getDlvDvsn())
63 64
                 .dlvDvsnNm(baseEntity.getDlvDvsnNm() == null ? "" : baseEntity.getDlvDvsnNm())
64 65
                 .podrTotalAmt(baseEntity.getPodrTotalAmt() == null ? 0 : baseEntity.getPodrTotalAmt())
66
+                .dlvReqDt(baseEntity.getDlvReqDt() == null ? "" : baseEntity.getDlvReqDt())
65 67
                 .shmtWhsId(baseEntity.getShmtWhsId() == null ? "" : baseEntity.getShmtWhsId())
66 68
                 .shmtWhsNm(baseEntity.getShmtWhsNm() == null ? "" : baseEntity.getShmtWhsNm())
67 69
                 .shmtLocation(baseEntity.getShmtLocation() == null ? "" : baseEntity.getShmtLocation())
@@ -104,7 +106,7 @@ public class PchOrdInitInfoResponse {
104 106
         private String itemNm;
105 107
 
106 108
         @ApiModelProperty(value = "단가")
107
-        private Integer unitAmt;
109
+        private Long unitAmt;
108 110
 
109 111
         @ApiModelProperty(value = "단위")
110 112
         private String unit;
@@ -116,7 +118,7 @@ public class PchOrdInitInfoResponse {
116 118
         private Integer podrQty;
117 119
 
118 120
         @ApiModelProperty(value = "발주금액")
119
-        private Integer podrAmt;
121
+        private Long podrAmt;
120 122
 
121 123
         @ApiModelProperty(value = "납기요청일")
122 124
         private String dlvReqDt;
@@ -130,6 +132,5 @@ public class PchOrdInitInfoResponse {
130 132
         @ApiModelProperty(value = "매장단가고유번호")
131 133
         private String storeUnitUnqNo;
132 134
 
133
-
134 135
     }
135 136
 }

+ 3 - 3
src/main/java/com/oqpo/api/web/dto/response/pomng/pchOrd/SpplyPchOdrInfoResponse.java

@@ -26,7 +26,7 @@ public class SpplyPchOdrInfoResponse {
26 26
     @ApiModelProperty(value = "공급사명") private String spplyNm;
27 27
     @ApiModelProperty(value = "발주일자") private String podrDt;
28 28
     @ApiModelProperty(value = "납품창고") private String whsDvsnNm;
29
-    @ApiModelProperty(value = "발주합계금액") private Integer podrTotalAmt;
29
+    @ApiModelProperty(value = "발주합계금액") private Long podrTotalAmt;
30 30
     @ApiModelProperty(value = "발주품목수량") private Integer podrItemQty;
31 31
     @ApiModelProperty(value = "발주담당자명") private String podrMgrNm;
32 32
     @ApiModelProperty(value = "발주담당자전화번호") private String podrMgrTelNo;
@@ -80,9 +80,9 @@ public class SpplyPchOdrInfoResponse {
80 80
         @ApiModelProperty(value = "품목아이디") private String itemId;
81 81
         @ApiModelProperty(value = "품목명") private String itemNm;
82 82
         @ApiModelProperty(value = "발주수량") private Integer podrQty;
83
-        @ApiModelProperty(value = "발주금액") private Integer podrAmt;
83
+        @ApiModelProperty(value = "발주금액") private Long podrAmt;
84 84
         @ApiModelProperty(value = "단위") private String unit;
85
-        @ApiModelProperty(value = "단가금액") private Integer unitAmt;
85
+        @ApiModelProperty(value = "단가금액") private Long unitAmt;
86 86
         @ApiModelProperty(value = "발주상세코드") private String podrDtlStCd;
87 87
         @ApiModelProperty(value = "발주상세명") private String podrDtlStNm;
88 88
     }

+ 1 - 1
src/main/java/com/oqpo/api/web/dto/response/pomng/pchOrd/SpplyPoOdrSearchListResponse.java

@@ -22,7 +22,7 @@ public class SpplyPoOdrSearchListResponse {
22 22
     @ApiModelProperty(value = "구매발주일자") private String podrDt;
23 23
     @ApiModelProperty(value = "납품요청일자") private String dlvReqDt;
24 24
     @ApiModelProperty(value = "납품창고명") private String whsNm;
25
-    @ApiModelProperty(value = "총 발주금액") private Integer podrTotalAmt;
25
+    @ApiModelProperty(value = "총 발주금액") private Long podrTotalAmt;
26 26
     @ApiModelProperty(value = "총 품목수량") private Integer podrItemQty;
27 27
     @ApiModelProperty(value = "발주담당자명") private String podrMgrNm;
28 28
 

+ 2 - 1
src/main/resources/mybatis/sqlmaps/pomng/PchOrd.xml

@@ -25,7 +25,8 @@
25 25
     <select id="selectRecPchDtlInitInfo" resultType="com.oqpo.api.entity.pomng.PchOdrDtlPtclEntity">
26 26
         select base.pch_req_unq_no , ptcl.pch_req_dtl_no
27 27
             , ptcl.item_id , ptcl.item_nm , ptcl.unit_amt , ptcl.unit
28
-            , ptcl.pch_req_qty, ptcl.pch_req_qty as podr_qty, ptcl.pch_req_amt , base.dlv_req_dt
28
+            , ptcl.pch_req_qty, ptcl.pch_req_qty as podr_qty, ptcl.pch_req_amt
29
+            , ptcl.pch_req_amt as podr_amt , date_format(base.dlv_req_dt,'%Y.%m.%d') as dlv_req_dt
29 30
             , 0 as whs_pass_qty, bunit.spply_id, fn_spply_nm(bunit.spply_id) as spply_nm
30 31
             , ptcl.brand_unit_unq_no, ptcl.store_unit_unq_no
31 32
         from pch_req_base_info base