Browse Source

구매요청 무정산 처리로직 빠림

dwkim 2 years ago
parent
commit
480a9beadb

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

@@ -1134,10 +1134,10 @@ public class ShmtOdrService extends CommonService {
1134 1134
 
1135 1135
                     // 재고관련 정리 필요
1136 1136
                     //stockMngMapper.updateWarehouseStockQty(userId, wareGridUpdateData);
1137
-
1138
-                    stockMngMapper.insertInOutStckMgntBaseInfo(userId, wareGridUpdateData);
1139
-
1140
-                    stockMngMapper.insertMultiStckMgntDtlHist(userId, stckMgntDtlHistList);
1137
+                    if (wareGridUpdateData.size() > 0) {
1138
+                        stockMngMapper.insertInOutStckMgntBaseInfo(userId, wareGridUpdateData);
1139
+                        stockMngMapper.insertMultiStckMgntDtlHist(userId, stckMgntDtlHistList);
1140
+                    }
1141 1141
 
1142 1142
                     // 납품서 상세 처리
1143 1143
                     shmtOdrMapper.updateDeliDtlStCd(userId, deliDtlGridUpdateData);

+ 1 - 1
src/main/java/com/oqpo/api/service/pomng/PchReqService.java

@@ -295,7 +295,7 @@ public class PchReqService extends CommonService {
295 295
             if ("PD01".equals(entity.getPchReqDvsn())  &&  "PR20".equals(entity.getPchReqStCd())) {
296 296
                 LoanMgntBaseInfoEntity loanMgnInfo = loanStateMapper.selectLoanJobDataInfo(entity.getStoreId());
297 297
 
298
-                if (loanMgnInfo.getOrdUseAmt() < sumData.getPchReqTotalAmt()) {
298
+                if (!"LD03".equals(loanMgnInfo.getLoanDvsn())  &&  loanMgnInfo.getOrdUseAmt() < sumData.getPchReqTotalAmt()) {
299 299
                     throw new GlobalException(SystemMessageCode.ERR_PCHREQAMTOVER);
300 300
                 }
301 301
 

+ 4 - 4
src/main/java/com/oqpo/api/service/stinfo/StoreBaseInfoService.java

@@ -261,9 +261,9 @@ public class StoreBaseInfoService extends CommonService {
261 261
                 locEntity.setBrandId(entity.getBrandId());
262 262
                 locEntity.setStckDvsn("SD01");
263 263
 
264
-                if ("N".equals(entity.getWhsUseYn())) {
265
-                    locEntity.setLocStCd("LOC003");
266
-                } else {
264
+                //if ("N".equals(entity.getWhsUseYn())) {
265
+               //    locEntity.setLocStCd("LOC003");
266
+               // } else {
267 267
                     if ("ST01".equals(entity.getStoreStCd())) {
268 268
                         locEntity.setLocStCd("LOC001");
269 269
                     } else if ("ST03".equals(entity.getStoreStCd())) {
@@ -271,7 +271,7 @@ public class StoreBaseInfoService extends CommonService {
271 271
                     } else {   //ST02
272 272
                         locEntity.setLocStCd("LOC002");
273 273
                     }
274
-                }
274
+               // }
275 275
 
276 276
                 whsMngService.addStoreWhsInfo(userId,saveWhsInfo, locEntity );
277 277