Browse Source

기준정보관리-품목관리 테스트 수정-1

yhl88 2 years ago
parent
commit
244c6e103e

+ 13 - 13
src/main/webapp/app/stinfo/STINFO04010.html

@@ -234,7 +234,7 @@
234 234
 													<input type="text" id="ITP_FORM_STINFO04010_DETAIL_WEIGHT"  class="form-control itp_input" name="weight" value="">
235 235
 												</div>
236 236
 												<div class="col-xs-4 itp_in">
237
-	              									<select id="ITP_FORM_STINFO04010_DETAIL_WEIGHT_UNIT" data-select-code="WEIGHT_UNIT" class="form-control itp_input detail_item_unit" name="weight_unit"></select>
237
+	              									<select id="ITP_FORM_STINFO04010_DETAIL_WEIGHT_UNIT" data-select-code="WEIGHT_UNIT" class="form-control itp_input detail_item_unit" name="weightUnit"></select>
238 238
 												</div>
239 239
 											</div>
240 240
 											<label class="col-xs-2 itp_lb">부피</label>
@@ -243,7 +243,7 @@
243 243
 													<input type="text" id="ITP_FORM_STINFO04010_DETAIL_VOLUME" class="form-control itp_input" name="volume" value="">
244 244
 												</div>
245 245
 												<div class="col-xs-4 itp_in">
246
-	              									<select id="ITP_FORM_STINFO04010_DETAIL_VOLUME_UNIT" data-select-code="VOLUME_UNIT" class="form-control itp_input detail_item_unit" name="volume_unit"></select>
246
+	              									<select id="ITP_FORM_STINFO04010_DETAIL_VOLUME_UNIT" data-select-code="VOLUME_UNIT" class="form-control itp_input detail_item_unit" name="volumeUnit"></select>
247 247
 												</div>
248 248
 											</div>
249 249
 										</div>
@@ -256,7 +256,7 @@
256 256
 													<input type="text" id="ITP_FORM_STINFO04010_DETAIL_WIDTH" class="form-control itp_input" name="width" value="">
257 257
 												</div>
258 258
 												<div class="col-xs-4 itp_in">
259
-	              									<select id="ITP_FORM_STINFO04010_DETAIL_WIDTH_UNIT" data-select-code="WIDTH_UNIT" class="form-control itp_input detail_item_unit" name="width_unit"></select>
259
+	              									<select id="ITP_FORM_STINFO04010_DETAIL_WIDTH_UNIT" data-select-code="WIDTH_UNIT" class="form-control itp_input detail_item_unit" name="widthUnit"></select>
260 260
 												</div>
261 261
 											</div>
262 262
 											<label class="col-xs-2 itp_lb">세로</label>
@@ -265,7 +265,7 @@
265 265
 													<input type="text" id="ITP_FORM_STINFO04010_DETAIL_HEIGHT" class="form-control itp_input" name="height" value="">
266 266
 												</div>
267 267
 												<div class="col-xs-4 itp_in">
268
-	              									<select id="ITP_FORM_STINFO04010_DETAIL_HEIGHT_UNIT" data-select-code="HEIGHT_UNIT" class="form-control itp_input detail_item_unit" name="height_unit"></select>
268
+	              									<select id="ITP_FORM_STINFO04010_DETAIL_HEIGHT_UNIT" data-select-code="HEIGHT_UNIT" class="form-control itp_input detail_item_unit" name="heightUnit"></select>
269 269
 												</div>
270 270
 											</div>
271 271
 										</div>
@@ -278,7 +278,7 @@
278 278
 													<input type="text" id="ITP_FORM_STINFO04010_DETAIL_HIGH" class="form-control itp_input" name="high" value="">
279 279
 												</div>
280 280
 												<div class="col-xs-4 itp_in">
281
-	              									<select id="ITP_FORM_STINFO04010_DETAIL_HIGH_UNIT" data-select-code="HIGH_UNIT" class="form-control itp_input detail_item_unit" name="high_unit"></select>
281
+	              									<select id="ITP_FORM_STINFO04010_DETAIL_HIGH_UNIT" data-select-code="HIGH_UNIT" class="form-control itp_input detail_item_unit" name="highUnit"></select>
282 282
 												</div>
283 283
 											</div>
284 284
 											<label class="col-xs-2 itp_lb">1Box수량</label>
@@ -411,7 +411,7 @@
411 411
 												</div>
412 412
 											<label class="col-xs-2 itp_lb">품목유형 *</label>
413 413
 											<div class="col-xs-5 itp_ip">
414
-												<div class="col-xs-9 itp_in fnItemType">
414
+												<div class="col-xs-9 itp_in fnItemTypeNm">
415 415
 												</div>
416 416
 											</div>
417 417
 										</div>
@@ -434,7 +434,7 @@
434 434
 										<div class="form-group">
435 435
 											<label class="col-xs-2 itp_lb">발주여부 *</label>
436 436
 											<div class="col-xs-5 itp_ip">
437
-												<div class="col-xs-6 itp_in fnPodrPssblDvsn">
437
+												<div class="col-xs-6 itp_in fnPodrPssblDvsnNm">
438 438
 												</div>
439 439
 											</div>
440 440
 											<label class="col-xs-2 itp_lb">기본단위 *</label>
@@ -477,13 +477,13 @@
477 477
 											<label class="col-xs-2 itp_lb">중량</label>
478 478
 											<div class="col-xs-5 itp_ip">
479 479
 												<div class="col-xs-3 itp_in fnWeight" style="width:auto;"></div>
480
-												<div class="col-xs-4 itp_in fnUnit"></div>
480
+												<div class="col-xs-4 itp_in fnWeightUnit"></div>
481 481
 											</div>
482 482
 											<label class="col-xs-2 itp_lb">부피</label>
483 483
 											<div class="col-xs-3 itp_ip">
484 484
 												<div class="col-xs-3 itp_in fnVolume" style="width:auto;">
485 485
 												</div>
486
-												<div class="col-xs-4 itp_in fnUnit">
486
+												<div class="col-xs-4 itp_in fnVolumeUnit">
487 487
 												</div>
488 488
 											</div>
489 489
 										</div>
@@ -494,14 +494,14 @@
494 494
 											<div class="col-xs-5 itp_ip">
495 495
 												<div class="col-xs-3 itp_in fnWidth" style="width:auto;">
496 496
 												</div>
497
-												<div class="col-xs-4 itp_in fnUnit">
497
+												<div class="col-xs-4 itp_in fnWidthUnit">
498 498
 												</div>
499 499
 											</div>
500 500
 											<label class="col-xs-2 itp_lb">세로</label>
501 501
 											<div class="col-xs-3 itp_ip">
502 502
 												<div class="col-xs-3 itp_in fnHeight" style="width:auto;">
503 503
 												</div>
504
-												<div class="col-xs-4 itp_in fnUnit">
504
+												<div class="col-xs-4 itp_in fnHeightUnit">
505 505
 												</div>
506 506
 											</div>
507 507
 										</div>
@@ -512,7 +512,7 @@
512 512
 											<div class="col-xs-5 itp_ip">
513 513
 												<div class="col-xs-3 itp_in fnHigh" style="width:auto;">
514 514
 												</div>
515
-												<div class="col-xs-4 itp_in fnUnit">
515
+												<div class="col-xs-4 itp_in fnHighUnit">
516 516
 												</div>
517 517
 											</div>
518 518
 											<label class="col-xs-2 itp_lb">1Box수량</label>
@@ -545,7 +545,7 @@
545 545
 											</div>
546 546
 											<label class="col-xs-2 itp_lb">반품구분</label>
547 547
 											<div class="col-xs-5 itp_ip">
548
-												<div class="col-xs-9 itp_in fnRtnDvsn">
548
+												<div class="col-xs-9 itp_in fnRtnDvsnNm">
549 549
 												</div>
550 550
 											</div>
551 551
 										</div>

+ 15 - 3
src/main/webapp/js/app/stinfo/ITP_STINFO04010.js

@@ -422,12 +422,12 @@ let viewObj = {
422 422
         $('#ITP_FORM_STINFO04010_VIEW .fnItemClass3').text(result.itemClass3Nm);
423 423
         $('#ITP_FORM_STINFO04010_VIEW .fnItemClass4').text(result.itemClass4Nm);
424 424
         $('#ITP_FORM_STINFO04010_VIEW .fnItemClassMgntNo').text(result.itemClassMgntNo);
425
-        $('#ITP_FORM_STINFO04010_VIEW .fnItemType').text(result.itemType);
425
+        $('#ITP_FORM_STINFO04010_VIEW .fnItemTypeNm').text(result.itemTypeNm);
426 426
         
427 427
         $('#ITP_FORM_STINFO04010_VIEW .fnItemNm').text(result.itemNm);
428 428
         
429 429
         $('#ITP_FORM_STINFO04010_VIEW .fnImpDvsn').text(result.impDvsnNm);
430
-        $('#ITP_FORM_STINFO04010_VIEW .fnPodrPssblDvsn').text(result.podrPssblDvsn);
430
+        $('#ITP_FORM_STINFO04010_VIEW .fnPodrPssblDvsnNm').text(result.podrPssblDvsnNm);
431 431
         $('#ITP_FORM_STINFO04010_VIEW .fnUnit').text(result.unit);
432 432
         $('#ITP_FORM_STINFO04010_VIEW .fnPchItemYn').text(result.pchItemYn);
433 433
         //$('#ITP_FORM_STINFO04010_VIEW .fnViewPchUnit').text(result.pchUnit);
@@ -436,15 +436,20 @@ let viewObj = {
436 436
         $('#ITP_FORM_STINFO04010_VIEW .fnBarcode').text(result.barcode);
437 437
         //$('#ITP_FORM_STINFO04010_VIEW .fnStckUnit').text(result.stckUnit);
438 438
         $('#ITP_FORM_STINFO04010_VIEW .fnWeight').text(result.weight);
439
+        $('#ITP_FORM_STINFO04010_VIEW .fnWeightUnit').text(result.weightUnitNm);
439 440
         $('#ITP_FORM_STINFO04010_VIEW .fnVolume').text(result.volume);
441
+        $('#ITP_FORM_STINFO04010_VIEW .fnVolumeUnit').text(result.volumeUnitNm);
440 442
         $('#ITP_FORM_STINFO04010_VIEW .fnWidth').text(result.width);
443
+        $('#ITP_FORM_STINFO04010_VIEW .fnWidthUnit').text(result.widthUnitNm);
441 444
         $('#ITP_FORM_STINFO04010_VIEW .fnHeight').text(result.height);
445
+        $('#ITP_FORM_STINFO04010_VIEW .fnHeightUnit').text(result.heightUnitNm);
442 446
         $('#ITP_FORM_STINFO04010_VIEW .fnHigh').text(result.high);
447
+        $('#ITP_FORM_STINFO04010_VIEW .fnHighUnit').text(result.highUnitNm);
443 448
         $('#ITP_FORM_STINFO04010_VIEW .fnOneBoxQty').text(result.oneBoxQty);
444 449
         $('#ITP_FORM_STINFO04010_VIEW .fnExpryYn').text(result.expryYn);
445 450
         $('#ITP_FORM_STINFO04010_VIEW .fnExpryPeriod').text(result.expryPeriod);
446 451
         $('#ITP_FORM_STINFO04010_VIEW .fnRtnPssblYn').text(result.rtnPssblYn);
447
-        $('#ITP_FORM_STINFO04010_VIEW .fnRtnDvsn').text(result.rtnDvsn);
452
+        $('#ITP_FORM_STINFO04010_VIEW .fnRtnDvsnNm').text(result.rtnDvsnNm);
448 453
 		$('#ITP_FORM_STINFO04010_VIEW .fnOqMenuCd').text(result.oqMenuCd);
449 454
 		$('#ITP_FORM_STINFO04010_VIEWL #ITP_FORM_STINFO04010_VIEW_OQ_BRAND_ID').val(result.oqBrandId);
450 455
 
@@ -490,11 +495,16 @@ let modifyObj = {
490 495
         $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_BARCODE').val(result.barcode);
491 496
         //$('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_STCK_UNIT').val(result.stckUnit);
492 497
         $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_WEIGHT').val(result.weight);
498
+        $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_WEIGHT_UNIT').val(result.weightUnit);
493 499
         $('#ITP_FORM_STINFO04010_DETAIL .item_unit').text(result.unit);
494 500
         $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_VOLUME').val(result.volume);
501
+        $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_VOLUME_UNIT').val(result.volumeUnit);        
495 502
         $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_WIDTH').val(result.width);
503
+        $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_WIDTH_UNIT').val(result.widthUnit);
496 504
         $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_HEIGHT').val(result.height);
505
+        $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_HEIGHT_UNIT').val(result.heightUnit);
497 506
         $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_HIGH').val(result.high);
507
+        $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_HIGH_UNIT').val(result.highUnit);
498 508
         $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_ONE_BOX_QTY').val(result.oneBoxQty);
499 509
         $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_EXPRY_YN').val(result.expryYn);
500 510
         $('#ITP_FORM_STINFO04010_DETAIL #ITP_FORM_STINFO04010_DETAIL_EXPRY_PERIOD').val(result.expryPeriod);
@@ -550,6 +560,8 @@ let createObj = {
550 560
             });
551 561
         },
552 562
         cancel: function() {
563
+        	let childrens = $('#ITP_FORM_STINFO04010_VIEW_FILE').children();
564
+        	childrens.remove();
553 565
             listObj.grid.search();
554 566
         },
555 567
         save: function() {