|
@@ -278,6 +278,21 @@ public class ItemUnitService extends CommonService {
|
278
|
278
|
entity.setBrandId(saveStoreItemUnitInfolRequest.getBrandId());
|
279
|
279
|
entity.setStoreId(saveStoreItemUnitInfolRequest.getStoreId());
|
280
|
280
|
|
|
281
|
+ List<StoreItemUnitEntity> gridUpdateData = saveStoreItemUnitInfolRequest.toCodeEntities(saveStoreItemUnitInfolRequest.getGridUpdateData());
|
|
282
|
+
|
|
283
|
+ if (gridUpdateData.size() > 0) {
|
|
284
|
+ for (int k = 0; k < gridUpdateData.size(); k++) {
|
|
285
|
+
|
|
286
|
+ String contSttDt = gridUpdateData.get(k).getContSttDt().replaceAll("\\.", "");
|
|
287
|
+ String contEndDt = gridUpdateData.get(k).getContEndDt().replaceAll("\\.", "");
|
|
288
|
+ gridUpdateData.get(k).setContSttDt(contSttDt);
|
|
289
|
+ gridUpdateData.get(k).setContEndDt(contEndDt);
|
|
290
|
+
|
|
291
|
+ entity.setContSttDt(contSttDt);
|
|
292
|
+ entity.setContEndDt(contEndDt);
|
|
293
|
+ }
|
|
294
|
+ }
|
|
295
|
+
|
281
|
296
|
|
282
|
297
|
// 동일 단가계약일자 존재시
|
283
|
298
|
String rcontEndDt = "";
|
|
@@ -291,15 +306,8 @@ public class ItemUnitService extends CommonService {
|
291
|
306
|
}
|
292
|
307
|
}
|
293
|
308
|
|
294
|
|
- List<StoreItemUnitEntity> gridUpdateData = saveStoreItemUnitInfolRequest.toCodeEntities(saveStoreItemUnitInfolRequest.getGridUpdateData());
|
295
|
|
- if (gridUpdateData.size() > 0) {
|
296
|
309
|
|
297
|
|
- for (int k=0 ; k < gridUpdateData.size() ; k++ ) {
|
298
|
|
- String contSttDt = gridUpdateData.get(k).getContSttDt().replaceAll("\\.","");
|
299
|
|
- String contEndDt = gridUpdateData.get(k).getContEndDt().replaceAll("\\.","");
|
300
|
|
- gridUpdateData.get(k).setContSttDt( contSttDt );
|
301
|
|
- gridUpdateData.get(k).setContEndDt( contEndDt );
|
302
|
|
- }
|
|
310
|
+ if (gridUpdateData.size() > 0) {
|
303
|
311
|
|
304
|
312
|
if (!"".equals(rcontEndDt)) {
|
305
|
313
|
for (int i = 0; i < gridUpdateData.size(); i++) {
|