dwkim 2 年之前
父节点
当前提交
6d936e5b17
共有 25 个文件被更改,包括 55 次插入47 次删除
  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
     private String itemId;
21
     private String itemId;
22
     private String itemNm;
22
     private String itemNm;
23
     private String unit;
23
     private String unit;
24
-    private Integer unitAmt;
24
+    private Long unitAmt;
25
     private String priceUnit;
25
     private String priceUnit;
26
     private Integer podrQty;
26
     private Integer podrQty;
27
     private Integer dlvQty;
27
     private Integer dlvQty;
28
-    private Integer podrAmt;
29
-    private Integer dlvAmt;
28
+    private Long podrAmt;
29
+    private Long dlvAmt;
30
     private String expryDate;
30
     private String expryDate;
31
     private String delayYn;
31
     private String delayYn;
32
     private String delayRsn;
32
     private String delayRsn;
@@ -35,7 +35,7 @@ public class DeliDtlMgntEntity implements Serializable {
35
     private String sysChgDttm;
35
     private String sysChgDttm;
36
     private String sysChgId;
36
     private String sysChgId;
37
     private Integer whsQty;
37
     private Integer whsQty;
38
-    private Integer whsAmt;
38
+    private Long whsAmt;
39
     private String shmtReqUnqNo;
39
     private String shmtReqUnqNo;
40
     private String shmtReqDtlNo;
40
     private String shmtReqDtlNo;
41
     private String dlvDtlStCd;
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
     private String spplyId;
16
     private String spplyId;
17
     private String spplyNm;
17
     private String spplyNm;
18
     private String dlvRegDt;
18
     private String dlvRegDt;
19
-    private Integer dlvAmt;
19
+    private Long dlvAmt;
20
     private String dlvMgrNm;
20
     private String dlvMgrNm;
21
     private String dlvMgrTelNo;
21
     private String dlvMgrTelNo;
22
     private String dlvMgrEmal;
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
     private String podrDvsn;
33
     private String podrDvsn;
34
     private String podrDvsnNm;
34
     private String podrDvsnNm;
35
     private Integer itemQty;
35
     private Integer itemQty;
36
-    private Integer shmtTotalAmt;
36
+    private Long shmtTotalAmt;
37
     private String podrMgrNm;
37
     private String podrMgrNm;
38
     private String dlvReqDt;
38
     private String dlvReqDt;
39
     private String whsId;
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
     private String shmtReqDtlNo;
16
     private String shmtReqDtlNo;
17
     private String itemId;
17
     private String itemId;
18
     private String itemNm;
18
     private String itemNm;
19
-    private Integer unitAmt;
19
+    private Long unitAmt;
20
     private String unit;
20
     private String unit;
21
     private String unitNm;
21
     private String unitNm;
22
     private Integer podrQty;
22
     private Integer podrQty;
23
-    private Integer podrAmt;
23
+    private Long podrAmt;
24
     private Integer shmtQty;
24
     private Integer shmtQty;
25
-    private Integer shmtAmt;
25
+    private Long shmtAmt;
26
     private String expryDate;
26
     private String expryDate;
27
     private String pchPodrUnqNo;
27
     private String pchPodrUnqNo;
28
     private String pchPodrDtlNo;
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
     private String brandNm;
19
     private String brandNm;
20
     private String pchReqDvsn;
20
     private String pchReqDvsn;
21
     private String pchReqDvsnNm;
21
     private String pchReqDvsnNm;
22
-    private Integer podrTotalAmt;
22
+    private Long podrTotalAmt;
23
     private String dlvPlace;
23
     private String dlvPlace;
24
     private String dlvPlaceDtl;
24
     private String dlvPlaceDtl;
25
     private String dlvDvsn;
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
     private String itemId;
19
     private String itemId;
20
     private String itemNm;
20
     private String itemNm;
21
     private Integer podrQty;
21
     private Integer podrQty;
22
-    private Integer podrAmt;
22
+    private Long podrAmt;
23
     private String curr;
23
     private String curr;
24
     private String currNm;
24
     private String currNm;
25
     private String unit;
25
     private String unit;
@@ -27,7 +27,7 @@ public class PchOdrDtlPtclEntity implements Serializable {
27
     private String priceUnit;
27
     private String priceUnit;
28
     private String priceUnitNm;
28
     private String priceUnitNm;
29
     private String dlvReqDt;
29
     private String dlvReqDt;
30
-    private Integer unitAmt;
30
+    private Long unitAmt;
31
     private String dlvSchDt;
31
     private String dlvSchDt;
32
     private Integer shmtPssblQty;
32
     private Integer shmtPssblQty;
33
     private String sysRegDttm;
33
     private String sysRegDttm;
@@ -42,6 +42,7 @@ public class PchOdrDtlPtclEntity implements Serializable {
42
     private String spplyNm;
42
     private String spplyNm;
43
     private String brandUnitUnqNo;
43
     private String brandUnitUnqNo;
44
     private String storeUnitUnqNo;
44
     private String storeUnitUnqNo;
45
+    private Long pchReqAmt;
45
 
46
 
46
     private String podrDtlStCd;
47
     private String podrDtlStCd;
47
     private String podrDtlStNm;
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
     private String dlvMgrMblNo;
37
     private String dlvMgrMblNo;
38
     private String itemId;
38
     private String itemId;
39
     private String itemNm;
39
     private String itemNm;
40
-    private Integer whsAmt;
40
+    private Long whsAmt;
41
     private String whsDlvChrg;
41
     private String whsDlvChrg;
42
     private String dlvMgrId;
42
     private String dlvMgrId;
43
     private String dlvCnfmDocFileNo;
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
     @ApiModelProperty(value = "창고구분명")
43
     @ApiModelProperty(value = "창고구분명")
44
     private String whsDvsnNm;
44
     private String whsDvsnNm;
45
     @ApiModelProperty(value = "단가")
45
     @ApiModelProperty(value = "단가")
46
-    private Integer unitAmt;
46
+    private Long unitAmt;
47
     @ApiModelProperty(value = "발주수량")
47
     @ApiModelProperty(value = "발주수량")
48
     private Integer podrQty;
48
     private Integer podrQty;
49
     @ApiModelProperty(value = "납품수량")
49
     @ApiModelProperty(value = "납품수량")

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

@@ -8,7 +8,7 @@ public enum DataMessageCode {
8
     DUPLICATE_YES ("Y", "사용 할 수 없는 아이디 입니다."),
8
     DUPLICATE_YES ("Y", "사용 할 수 없는 아이디 입니다."),
9
     DUPLICATE_CODE_NO ("N", "사용 가능한 코드 입니다."),
9
     DUPLICATE_CODE_NO ("N", "사용 가능한 코드 입니다."),
10
     DUPLICATE_CODE_YES ("Y", "사용 할 수 없는 코드 입니다."),
10
     DUPLICATE_CODE_YES ("Y", "사용 할 수 없는 코드 입니다."),
11
-    OK_PCHORD ("Y", "발주 생성 가능합니다."),
11
+    OK_PCHORD ("Y", ""),  //발주 생성 가능합니다.
12
     NOT_NEQWHSID ("N", "동일한 납품장소로 발주를 진행해야 합니다.!"),
12
     NOT_NEQWHSID ("N", "동일한 납품장소로 발주를 진행해야 합니다.!"),
13
     NOT_NEQSPPLY ("N", "동일한 공급사로 발주를 진행해야 합니다.!"),
13
     NOT_NEQSPPLY ("N", "동일한 공급사로 발주를 진행해야 합니다.!"),
14
     NOT_NEQDLVDT ("N", "동일한 납품요청일로 발주를 진행해야 합니다.!"),
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
             String shmtWhsId = "";
144
             String shmtWhsId = "";
145
             String shmtLocation = "";
145
             String shmtLocation = "";
146
             int itemQty = 0;
146
             int itemQty = 0;
147
-            int shmtTotalAmt = 0;
147
+            long shmtTotalAmt = 0;
148
             String expryDate = "";
148
             String expryDate = "";
149
             int shmtQty = 0;
149
             int shmtQty = 0;
150
             String shmtReqUnqNo = "";
150
             String shmtReqUnqNo = "";
@@ -638,12 +638,12 @@ public class ShmtOdrService extends CommonService {
638
 
638
 
639
             List<PchOdrDtlPtclEntity> gridInsertData = saveSpplyDlvRequest.toCodeEntities(saveSpplyDlvRequest.getGridInsertData());
639
             List<PchOdrDtlPtclEntity> gridInsertData = saveSpplyDlvRequest.toCodeEntities(saveSpplyDlvRequest.getGridInsertData());
640
             List<PchOdrBaseInfoEntity> jobList = shmtOdrMapper.selectShmtJobDataList(saveSpplyDlvRequest.getBrandId(), gridInsertData);
640
             List<PchOdrBaseInfoEntity> jobList = shmtOdrMapper.selectShmtJobDataList(saveSpplyDlvRequest.getBrandId(), gridInsertData);
641
-            int shmtTotalAmt = 0;
641
+            long shmtTotalAmt = 0;
642
             String expryDate = "";
642
             String expryDate = "";
643
             int shmtQty = 0;
643
             int shmtQty = 0;
644
             String dlvSttmtUnqNo = "";
644
             String dlvSttmtUnqNo = "";
645
             String storeId = "" ;
645
             String storeId = "" ;
646
-            int chgLoanAmt = 0 ;
646
+            long chgLoanAmt = 0 ;
647
 
647
 
648
             DeliInfoMgntEntity deliBaseEntity = new DeliInfoMgntEntity();
648
             DeliInfoMgntEntity deliBaseEntity = new DeliInfoMgntEntity();
649
             List<DeliDtlMgntEntity> deliDtlList = new ArrayList<DeliDtlMgntEntity>();
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
         PchOdrBaseInfoEntity headData =  headList.get(0);
154
         PchOdrBaseInfoEntity headData =  headList.get(0);
155
-        int podrTotalAmt = 0 ; // 총 발주금액
155
+        long podrTotalAmt = 0 ; // 총 발주금액
156
         String dlvReqDt = ""; // 납품요청일
156
         String dlvReqDt = ""; // 납품요청일
157
         String spplyId = ""; // 공급업체
157
         String spplyId = ""; // 공급업체
158
         String spplyNm = ""; //공급업체명
158
         String spplyNm = ""; //공급업체명
@@ -168,7 +168,9 @@ public class PchOrdService extends CommonService {
168
                 PchOdrDtlPtclEntity itemInfo = itemList.get(j);
168
                 PchOdrDtlPtclEntity itemInfo = itemList.get(j);
169
                 podrTotalAmt = podrTotalAmt + (itemInfo.getUnitAmt() * itemInfo.getPchReqQty());
169
                 podrTotalAmt = podrTotalAmt + (itemInfo.getUnitAmt() * itemInfo.getPchReqQty());
170
                 if ("".equals(dlvReqDt)) {
170
                 if ("".equals(dlvReqDt)) {
171
+                   // System.out.println(" before==dlvReqDt===================>" + dlvReqDt);
171
                     dlvReqDt = itemInfo.getDlvReqDt();
172
                     dlvReqDt = itemInfo.getDlvReqDt();
173
+                   // System.out.println(" after==dlvReqDt===================>" + dlvReqDt);
172
                 } else {
174
                 } else {
173
                     if (!dlvReqDt.equals(itemInfo.getDlvReqDt())) {
175
                     if (!dlvReqDt.equals(itemInfo.getDlvReqDt())) {
174
                         throw new GlobalException(SystemMessageCode.ERR_NEQDLVDT);
176
                         throw new GlobalException(SystemMessageCode.ERR_NEQDLVDT);
@@ -191,12 +193,16 @@ public class PchOrdService extends CommonService {
191
                 if ("".equals(spplyId)) {
193
                 if ("".equals(spplyId)) {
192
                     throw new GlobalException(SystemMessageCode.ERR_NONSPPLY);
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
         headData.setSpplyId(spplyId);
201
         headData.setSpplyId(spplyId);
198
         headData.setSpplyNm(spplyNm);
202
         headData.setSpplyNm(spplyNm);
199
         headData.setPodrTotalAmt(podrTotalAmt);
203
         headData.setPodrTotalAmt(podrTotalAmt);
204
+        headData.setDlvReqDt(dlvReqDt);
205
+       // System.out.println(" headData==dlvReqDt===================>" + headData.getDlvReqDt());
200
 
206
 
201
 
207
 
202
         return PchOrdInitInfoResponse.toDTO(uEntity, headData, itemList);
208
         return PchOrdInitInfoResponse.toDTO(uEntity, headData, itemList);
@@ -259,7 +265,7 @@ public class PchOrdService extends CommonService {
259
 
265
 
260
             List<PchReqBaseInfoEntity> pchReqList = new ArrayList<PchReqBaseInfoEntity>();
266
             List<PchReqBaseInfoEntity> pchReqList = new ArrayList<PchReqBaseInfoEntity>();
261
             if (gridUpdateData.size() > 0) {
267
             if (gridUpdateData.size() > 0) {
262
-                int poTotAmt = 0 ;
268
+                long poTotAmt = 0 ;
263
                 int poItemCnt = 0 ;
269
                 int poItemCnt = 0 ;
264
                 String  diffSpplyYn = "N" ;
270
                 String  diffSpplyYn = "N" ;
265
                 for (int i = 0 ; i < gridUpdateData.size() ;i++ ) {
271
                 for (int i = 0 ; i < gridUpdateData.size() ;i++ ) {
@@ -290,7 +296,7 @@ public class PchOrdService extends CommonService {
290
                     poSaveDtlEntity.setPchReqUnqNo(poDtlEntity.getPchReqUnqNo());
296
                     poSaveDtlEntity.setPchReqUnqNo(poDtlEntity.getPchReqUnqNo());
291
                     poSaveDtlEntity.setPchReqDtlNo(poDtlEntity.getPchReqDtlNo());
297
                     poSaveDtlEntity.setPchReqDtlNo(poDtlEntity.getPchReqDtlNo());
292
                     poSaveDtlEntity.setPodrQty(poDtlEntity.getPodrQty());
298
                     poSaveDtlEntity.setPodrQty(poDtlEntity.getPodrQty());
293
-                    poSaveDtlEntity.setPodrAmt(poDtlEntity.getPodrQty() * poSaveDtlEntity.getUnitAmt() );
299
+                    poSaveDtlEntity.setPodrAmt(Long.valueOf(poDtlEntity.getPodrQty()) * poSaveDtlEntity.getUnitAmt() );
294
                     poSaveDtlEntity.setCurr("KRW");
300
                     poSaveDtlEntity.setCurr("KRW");
295
                     poSaveDtlEntity.setPodrDtlStCd("POD0");
301
                     poSaveDtlEntity.setPodrDtlStCd("POD0");
296
                     poSaveDtlEntity.setBrandUnitUnqNo(poDtlEntity.getBrandUnitUnqNo());
302
                     poSaveDtlEntity.setBrandUnitUnqNo(poDtlEntity.getBrandUnitUnqNo());
@@ -429,7 +435,7 @@ public class PchOrdService extends CommonService {
429
     public void cancelPchOrdDtl(String userId, CancelPchOrdDtlRequest cancelPchOrdDtlRequest) throws Exception {
435
     public void cancelPchOrdDtl(String userId, CancelPchOrdDtlRequest cancelPchOrdDtlRequest) throws Exception {
430
         try {
436
         try {
431
             // 품목 삭제 상태처리
437
             // 품목 삭제 상태처리
432
-            Integer podrAmt = 0 ;
438
+            long podrAmt = 0;
433
             List<PchOdrDtlPtclEntity> gridUpdateData = cancelPchOrdDtlRequest.toCodeEntities(cancelPchOrdDtlRequest.getGridUpdateData());
439
             List<PchOdrDtlPtclEntity> gridUpdateData = cancelPchOrdDtlRequest.toCodeEntities(cancelPchOrdDtlRequest.getGridUpdateData());
434
             List<StckMgntBaseInfoEntity> stckList = new ArrayList<StckMgntBaseInfoEntity>();
440
             List<StckMgntBaseInfoEntity> stckList = new ArrayList<StckMgntBaseInfoEntity>();
435
             if (gridUpdateData.size() > 0) {
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
         @ApiModelProperty(value = "구매요청상세번호") private String pchPodrDtlNo;
67
         @ApiModelProperty(value = "구매요청상세번호") private String pchPodrDtlNo;
68
         @ApiModelProperty(value = "품목아이디") private String itemId;
68
         @ApiModelProperty(value = "품목아이디") private String itemId;
69
         @ApiModelProperty(value = "발주수량") private Integer podrQty;
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
 @Setter
12
 @Setter
13
 public class PchReqOrdInitRequest {
13
 public class PchReqOrdInitRequest {
14
 
14
 
15
-    @NotBlank
16
     @ApiModelProperty(value = "CRUD")
15
     @ApiModelProperty(value = "CRUD")
17
     private String viewCd;
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
     @ApiModelProperty(value = "발주금액") private Integer podrQty;
34
     @ApiModelProperty(value = "발주금액") private Integer podrQty;
35
     @ApiModelProperty(value = "납품/수주 수량") private Integer dlvQty;
35
     @ApiModelProperty(value = "납품/수주 수량") private Integer dlvQty;
36
     @ApiModelProperty(value = "단위") private String unit;
36
     @ApiModelProperty(value = "단위") private String unit;
37
-    @ApiModelProperty(value = "납품금액") private Integer unitAmt;
37
+    @ApiModelProperty(value = "납품금액") private Long unitAmt;
38
     @ApiModelProperty(value = "납품담당자명") private String dlvMgrNm;
38
     @ApiModelProperty(value = "납품담당자명") private String dlvMgrNm;
39
     @ApiModelProperty(value = "납품담당자연락처") private String dlvMgrTelNo;
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
     @ApiModelProperty(value = "납품창고아이디") private String whsId;
23
     @ApiModelProperty(value = "납품창고아이디") private String whsId;
24
     @ApiModelProperty(value = "납품창고명") private String whsNm;
24
     @ApiModelProperty(value = "납품창고명") private String whsNm;
25
     @ApiModelProperty(value = "납품LOCATION") private String location;
25
     @ApiModelProperty(value = "납품LOCATION") private String location;
26
-    @ApiModelProperty(value = "단가") private Integer unitAmt;
26
+    @ApiModelProperty(value = "단가") private Long unitAmt;
27
     @ApiModelProperty(value = "발주수량") private Integer podrQty;
27
     @ApiModelProperty(value = "발주수량") private Integer podrQty;
28
     @ApiModelProperty(value = "출고수량") private Integer shmtQty;
28
     @ApiModelProperty(value = "출고수량") private Integer shmtQty;
29
     @ApiModelProperty(value = "현 재고") private Integer stckQty;
29
     @ApiModelProperty(value = "현 재고") private Integer stckQty;
30
     @ApiModelProperty(value = "유통기한여부") private String expryYn;
30
     @ApiModelProperty(value = "유통기한여부") private String expryYn;
31
     @ApiModelProperty(value = "유통기한기간") private Integer expryPeriod;
31
     @ApiModelProperty(value = "유통기한기간") private Integer expryPeriod;
32
     @ApiModelProperty(value = "유통일자") private String expryDate;
32
     @ApiModelProperty(value = "유통일자") private String expryDate;
33
-    @ApiModelProperty(value = "발주금액") private Integer podrAmt;
33
+    @ApiModelProperty(value = "발주금액") private Long podrAmt;
34
     @ApiModelProperty(value = "납품요청일") private String dlvReqDt;
34
     @ApiModelProperty(value = "납품요청일") private String dlvReqDt;
35
     @ApiModelProperty(value = "출고창고아이디") private String shmtWhsId;
35
     @ApiModelProperty(value = "출고창고아이디") private String shmtWhsId;
36
     @ApiModelProperty(value = "출고LOCATION") private String shmtLocation;
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
     @ApiModelProperty(value = "납품창고명") private String whsNm;
28
     @ApiModelProperty(value = "납품창고명") private String whsNm;
29
     @ApiModelProperty(value = "납품LOCATION") private String location;
29
     @ApiModelProperty(value = "납품LOCATION") private String location;
30
     @ApiModelProperty(value = "출고수량") private Integer shmtQty;
30
     @ApiModelProperty(value = "출고수량") private Integer shmtQty;
31
-    @ApiModelProperty(value = "출고금액") private Integer shmtAmt;
31
+    @ApiModelProperty(value = "출고금액") private Long shmtAmt;
32
     @ApiModelProperty(value = "입고수량") private Integer whsQty;
32
     @ApiModelProperty(value = "입고수량") private Integer whsQty;
33
-    @ApiModelProperty(value = "입고금액") private Integer whsAmt;
33
+    @ApiModelProperty(value = "입고금액") private Long whsAmt;
34
     @ApiModelProperty(value = "입고일자") private String whsDt;
34
     @ApiModelProperty(value = "입고일자") private String whsDt;
35
     @ApiModelProperty(value = "입고담당자") private String whsCnfmNm;
35
     @ApiModelProperty(value = "입고담당자") private String whsCnfmNm;
36
     @ApiModelProperty(value = "납품서번호") private String dlvSttmtUnqNo;
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
     @ApiModelProperty(value = "브랜드아이디") private String brandId;
23
     @ApiModelProperty(value = "브랜드아이디") private String brandId;
24
     @ApiModelProperty(value = "브랜드명") private String brandNm;
24
     @ApiModelProperty(value = "브랜드명") private String brandNm;
25
     @ApiModelProperty(value = "납품서생성일") private String dlvReqDt;
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
     @ApiModelProperty(value = "납품창고아이디") private String whsId;
27
     @ApiModelProperty(value = "납품창고아이디") private String whsId;
28
     @ApiModelProperty(value = "납품찿고명") private String whsNm;
28
     @ApiModelProperty(value = "납품찿고명") private String whsNm;
29
     @ApiModelProperty(value = "location") private String location;
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
     @ApiModelProperty(value = "납품창고아이디") private String whsId;
23
     @ApiModelProperty(value = "납품창고아이디") private String whsId;
24
     @ApiModelProperty(value = "납품창고명") private String whsNm;
24
     @ApiModelProperty(value = "납품창고명") private String whsNm;
25
     @ApiModelProperty(value = "납품LOCATION") private String location;
25
     @ApiModelProperty(value = "납품LOCATION") private String location;
26
-    @ApiModelProperty(value = "단가") private Integer unitAmt;
26
+    @ApiModelProperty(value = "단가") private Long unitAmt;
27
     @ApiModelProperty(value = "발주수량") private Integer podrQty;
27
     @ApiModelProperty(value = "발주수량") private Integer podrQty;
28
-    @ApiModelProperty(value = "발주금액") private Integer podrAmt;
28
+    @ApiModelProperty(value = "발주금액") private Long podrAmt;
29
     @ApiModelProperty(value = "납품요청일") private String dlvReqDt;
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
     @ApiModelProperty(value = "발주금액") private Integer podrQty;
23
     @ApiModelProperty(value = "발주금액") private Integer podrQty;
24
     @ApiModelProperty(value = "납품/수주 수량") private Integer dlvQty;
24
     @ApiModelProperty(value = "납품/수주 수량") private Integer dlvQty;
25
     @ApiModelProperty(value = "입고 수량") private Integer whsQty;
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
     @ApiModelProperty(value = "납품창고아이디") private String whsId;
28
     @ApiModelProperty(value = "납품창고아이디") private String whsId;
29
     @ApiModelProperty(value = "납품LOCATION") private String location;
29
     @ApiModelProperty(value = "납품LOCATION") private String location;
30
     @ApiModelProperty(value = "납품창고명") private String whsNm;
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
     @ApiModelProperty(value = "발주일자") private String podrDt;
31
     @ApiModelProperty(value = "발주일자") private String podrDt;
32
     @ApiModelProperty(value = "납품창고") private String whsDvsnNm;
32
     @ApiModelProperty(value = "납품창고") private String whsDvsnNm;
33
     @ApiModelProperty(value = "출고창고") private String shmtWhsDvsnNm;
33
     @ApiModelProperty(value = "출고창고") private String shmtWhsDvsnNm;
34
-    @ApiModelProperty(value = "발주합계금액") private Integer podrTotalAmt;
34
+    @ApiModelProperty(value = "발주합계금액") private Long podrTotalAmt;
35
     @ApiModelProperty(value = "발주품목수량") private Integer podrItemQty;
35
     @ApiModelProperty(value = "발주품목수량") private Integer podrItemQty;
36
     @ApiModelProperty(value = "발주담당자명") private String podrMgrNm;
36
     @ApiModelProperty(value = "발주담당자명") private String podrMgrNm;
37
     @ApiModelProperty(value = "발주담당자전화번호") private String podrMgrTelNo;
37
     @ApiModelProperty(value = "발주담당자전화번호") private String podrMgrTelNo;
@@ -89,9 +89,9 @@ public class PchOdrInfoResponse {
89
         @ApiModelProperty(value = "품목아이디") private String itemId;
89
         @ApiModelProperty(value = "품목아이디") private String itemId;
90
         @ApiModelProperty(value = "품목명") private String itemNm;
90
         @ApiModelProperty(value = "품목명") private String itemNm;
91
         @ApiModelProperty(value = "발주수량") private Integer podrQty;
91
         @ApiModelProperty(value = "발주수량") private Integer podrQty;
92
-        @ApiModelProperty(value = "발주금액") private Integer podrAmt;
92
+        @ApiModelProperty(value = "발주금액") private Long podrAmt;
93
         @ApiModelProperty(value = "단위") private String unit;
93
         @ApiModelProperty(value = "단위") private String unit;
94
-        @ApiModelProperty(value = "단가금액") private Integer unitAmt;
94
+        @ApiModelProperty(value = "단가금액") private Long unitAmt;
95
         @ApiModelProperty(value = "출고가능수량") private Integer whsPassQty;
95
         @ApiModelProperty(value = "출고가능수량") private Integer whsPassQty;
96
         @ApiModelProperty(value = "발주상세코드") private String podrDtlStCd;
96
         @ApiModelProperty(value = "발주상세코드") private String podrDtlStCd;
97
         @ApiModelProperty(value = "발주상세명") private String podrDtlStNm;
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
     @ApiModelProperty(value = "납품LOCATION명") private String locationNm;
24
     @ApiModelProperty(value = "납품LOCATION명") private String locationNm;
25
     @ApiModelProperty(value = "공급사아이디") private String spplyId;
25
     @ApiModelProperty(value = "공급사아이디") private String spplyId;
26
     @ApiModelProperty(value = "공급사명") private String spplyNm;
26
     @ApiModelProperty(value = "공급사명") private String spplyNm;
27
-    @ApiModelProperty(value = "발주합계금액") private Integer podrTotalAmt;
27
+    @ApiModelProperty(value = "발주합계금액") private Long podrTotalAmt;
28
     @ApiModelProperty(value = "발주품목수량") private Integer podrItemQty;
28
     @ApiModelProperty(value = "발주품목수량") private Integer podrItemQty;
29
     @ApiModelProperty(value = "발주담당자명") private String podrMgrNm;
29
     @ApiModelProperty(value = "발주담당자명") private String podrMgrNm;
30
     @ApiModelProperty(value = "출하창고명") private String shmtWhsNm;
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
     @ApiModelProperty(value = "배송구분코드") private String dlvDvsn;
36
     @ApiModelProperty(value = "배송구분코드") private String dlvDvsn;
37
     @ApiModelProperty(value = "배송구분명") private String dlvDvsnNm;
37
     @ApiModelProperty(value = "배송구분명") private String dlvDvsnNm;
38
     @ApiModelProperty(value = "발주총금액") private long podrTotalAmt;
38
     @ApiModelProperty(value = "발주총금액") private long podrTotalAmt;
39
+    @ApiModelProperty(value = "납품요청일") private String dlvReqDt;
39
     @ApiModelProperty(value = "출하창고아이디") private String shmtWhsId;
40
     @ApiModelProperty(value = "출하창고아이디") private String shmtWhsId;
40
     @ApiModelProperty(value = "출하창고명") private String shmtWhsNm;
41
     @ApiModelProperty(value = "출하창고명") private String shmtWhsNm;
41
     @ApiModelProperty(value = "츨히location") private String shmtLocation;
42
     @ApiModelProperty(value = "츨히location") private String shmtLocation;
@@ -62,6 +63,7 @@ public class PchOrdInitInfoResponse {
62
                 .dlvDvsn(baseEntity.getDlvDvsn() == null ? "" : baseEntity.getDlvDvsn())
63
                 .dlvDvsn(baseEntity.getDlvDvsn() == null ? "" : baseEntity.getDlvDvsn())
63
                 .dlvDvsnNm(baseEntity.getDlvDvsnNm() == null ? "" : baseEntity.getDlvDvsnNm())
64
                 .dlvDvsnNm(baseEntity.getDlvDvsnNm() == null ? "" : baseEntity.getDlvDvsnNm())
64
                 .podrTotalAmt(baseEntity.getPodrTotalAmt() == null ? 0 : baseEntity.getPodrTotalAmt())
65
                 .podrTotalAmt(baseEntity.getPodrTotalAmt() == null ? 0 : baseEntity.getPodrTotalAmt())
66
+                .dlvReqDt(baseEntity.getDlvReqDt() == null ? "" : baseEntity.getDlvReqDt())
65
                 .shmtWhsId(baseEntity.getShmtWhsId() == null ? "" : baseEntity.getShmtWhsId())
67
                 .shmtWhsId(baseEntity.getShmtWhsId() == null ? "" : baseEntity.getShmtWhsId())
66
                 .shmtWhsNm(baseEntity.getShmtWhsNm() == null ? "" : baseEntity.getShmtWhsNm())
68
                 .shmtWhsNm(baseEntity.getShmtWhsNm() == null ? "" : baseEntity.getShmtWhsNm())
67
                 .shmtLocation(baseEntity.getShmtLocation() == null ? "" : baseEntity.getShmtLocation())
69
                 .shmtLocation(baseEntity.getShmtLocation() == null ? "" : baseEntity.getShmtLocation())
@@ -104,7 +106,7 @@ public class PchOrdInitInfoResponse {
104
         private String itemNm;
106
         private String itemNm;
105
 
107
 
106
         @ApiModelProperty(value = "단가")
108
         @ApiModelProperty(value = "단가")
107
-        private Integer unitAmt;
109
+        private Long unitAmt;
108
 
110
 
109
         @ApiModelProperty(value = "단위")
111
         @ApiModelProperty(value = "단위")
110
         private String unit;
112
         private String unit;
@@ -116,7 +118,7 @@ public class PchOrdInitInfoResponse {
116
         private Integer podrQty;
118
         private Integer podrQty;
117
 
119
 
118
         @ApiModelProperty(value = "발주금액")
120
         @ApiModelProperty(value = "발주금액")
119
-        private Integer podrAmt;
121
+        private Long podrAmt;
120
 
122
 
121
         @ApiModelProperty(value = "납기요청일")
123
         @ApiModelProperty(value = "납기요청일")
122
         private String dlvReqDt;
124
         private String dlvReqDt;
@@ -130,6 +132,5 @@ public class PchOrdInitInfoResponse {
130
         @ApiModelProperty(value = "매장단가고유번호")
132
         @ApiModelProperty(value = "매장단가고유번호")
131
         private String storeUnitUnqNo;
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
     @ApiModelProperty(value = "공급사명") private String spplyNm;
26
     @ApiModelProperty(value = "공급사명") private String spplyNm;
27
     @ApiModelProperty(value = "발주일자") private String podrDt;
27
     @ApiModelProperty(value = "발주일자") private String podrDt;
28
     @ApiModelProperty(value = "납품창고") private String whsDvsnNm;
28
     @ApiModelProperty(value = "납품창고") private String whsDvsnNm;
29
-    @ApiModelProperty(value = "발주합계금액") private Integer podrTotalAmt;
29
+    @ApiModelProperty(value = "발주합계금액") private Long podrTotalAmt;
30
     @ApiModelProperty(value = "발주품목수량") private Integer podrItemQty;
30
     @ApiModelProperty(value = "발주품목수량") private Integer podrItemQty;
31
     @ApiModelProperty(value = "발주담당자명") private String podrMgrNm;
31
     @ApiModelProperty(value = "발주담당자명") private String podrMgrNm;
32
     @ApiModelProperty(value = "발주담당자전화번호") private String podrMgrTelNo;
32
     @ApiModelProperty(value = "발주담당자전화번호") private String podrMgrTelNo;
@@ -80,9 +80,9 @@ public class SpplyPchOdrInfoResponse {
80
         @ApiModelProperty(value = "품목아이디") private String itemId;
80
         @ApiModelProperty(value = "품목아이디") private String itemId;
81
         @ApiModelProperty(value = "품목명") private String itemNm;
81
         @ApiModelProperty(value = "품목명") private String itemNm;
82
         @ApiModelProperty(value = "발주수량") private Integer podrQty;
82
         @ApiModelProperty(value = "발주수량") private Integer podrQty;
83
-        @ApiModelProperty(value = "발주금액") private Integer podrAmt;
83
+        @ApiModelProperty(value = "발주금액") private Long podrAmt;
84
         @ApiModelProperty(value = "단위") private String unit;
84
         @ApiModelProperty(value = "단위") private String unit;
85
-        @ApiModelProperty(value = "단가금액") private Integer unitAmt;
85
+        @ApiModelProperty(value = "단가금액") private Long unitAmt;
86
         @ApiModelProperty(value = "발주상세코드") private String podrDtlStCd;
86
         @ApiModelProperty(value = "발주상세코드") private String podrDtlStCd;
87
         @ApiModelProperty(value = "발주상세명") private String podrDtlStNm;
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
     @ApiModelProperty(value = "구매발주일자") private String podrDt;
22
     @ApiModelProperty(value = "구매발주일자") private String podrDt;
23
     @ApiModelProperty(value = "납품요청일자") private String dlvReqDt;
23
     @ApiModelProperty(value = "납품요청일자") private String dlvReqDt;
24
     @ApiModelProperty(value = "납품창고명") private String whsNm;
24
     @ApiModelProperty(value = "납품창고명") private String whsNm;
25
-    @ApiModelProperty(value = "총 발주금액") private Integer podrTotalAmt;
25
+    @ApiModelProperty(value = "총 발주금액") private Long podrTotalAmt;
26
     @ApiModelProperty(value = "총 품목수량") private Integer podrItemQty;
26
     @ApiModelProperty(value = "총 품목수량") private Integer podrItemQty;
27
     @ApiModelProperty(value = "발주담당자명") private String podrMgrNm;
27
     @ApiModelProperty(value = "발주담당자명") private String podrMgrNm;
28
 
28
 

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

@@ -25,7 +25,8 @@
25
     <select id="selectRecPchDtlInitInfo" resultType="com.oqpo.api.entity.pomng.PchOdrDtlPtclEntity">
25
     <select id="selectRecPchDtlInitInfo" resultType="com.oqpo.api.entity.pomng.PchOdrDtlPtclEntity">
26
         select base.pch_req_unq_no , ptcl.pch_req_dtl_no
26
         select base.pch_req_unq_no , ptcl.pch_req_dtl_no
27
             , ptcl.item_id , ptcl.item_nm , ptcl.unit_amt , ptcl.unit
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
             , 0 as whs_pass_qty, bunit.spply_id, fn_spply_nm(bunit.spply_id) as spply_nm
30
             , 0 as whs_pass_qty, bunit.spply_id, fn_spply_nm(bunit.spply_id) as spply_nm
30
             , ptcl.brand_unit_unq_no, ptcl.store_unit_unq_no
31
             , ptcl.brand_unit_unq_no, ptcl.store_unit_unq_no
31
         from pch_req_base_info base
32
         from pch_req_base_info base