diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-main.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-main.jsp
index 07befae..ecac463 100644
--- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-main.jsp
@@ -141,6 +141,8 @@
제품코드 |
폐기수량 |
유효기간 |
+ 제조번호 |
+ 일련번호 |
유통단위 수량 |
낱개단위 수량 |
@@ -154,6 +156,8 @@
{PRDUCT_CD} |
{DSUSE_QY} {PCE_UNIT} |
{PRD_VALID_DE} |
+ {MNF_NO} |
+ {MNF_SEQ} |
{MIN_DISTB_QY} {MIN_DISTB_UNIT} |
{PCE_QY} {PCE_UNIT} |
diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-info.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-info.jsp
index 3248de0..6b2342e 100644
--- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-info.jsp
@@ -64,15 +64,15 @@
-
+
-
+
-
+
@@ -318,7 +318,7 @@
}
//$P.control.onSave(resp)
- dialog.alert("저장됐습니다.");
+ dialog.alert("처리 되었습니다.");
dialog.close("dsuseMgtReceiptDialog");
//this._load();
}
@@ -440,14 +440,17 @@
return false;
}
+ const prdFrm = $P.productFormFields.get();
+ const prdInfo = ""+prdFrm.prductCd+prdFrm.prdValidDe+prdFrm.mnfNo+prdFrm.mnfSeq;
let isDup = $P.productList
.getDataset()
- .filter(item => item.prductCd == $P.productFormFields.get().prductCd)
+ .filter(item => prdInfo == ""+item.prductCd+item.prdValidDe+item.mnfNo+item.mnfSeq)
.length > 0;
if(isDup){
+ const msg = "추가된 제품 입니다
[제품코드:" + prdFrm.prductCd +", 유효기간:"+ prdFrm.prdValidDe +", 제조번호:"+ prdFrm.mnfNo +", 제조일련번호:"+ prdFrm.mnfSeq +"]";
dialog.alert({
- content: "등록한 상품[" + $P.productFormFields.get().prductCd + "]입니다"
+ content: msg
});
return false;
}
diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-main.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-main.jsp
index ab9b1a3..139c5d7 100644
--- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-main.jsp
@@ -146,6 +146,8 @@
제품코드 |
폐기수량 |
유효기간 |
+ 제조번호 |
+ 일련번호 |
최소 유통단위 수량 |
낱개 단위 수량 |
@@ -159,6 +161,8 @@
{PRDUCT_CD} |
{DSUSE_QY} {PCE_UNIT} |
{PRD_VALID_DE} |
+ {MNF_NO} |
+ {MNF_SEQ} |
{MIN_DISTB_QY} {MIN_DISTB_UNIT} |
{PCE_QY} {PCE_UNIT} |
diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-main.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-main.jsp
index 9983289..b90299c 100644
--- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-main.jsp
@@ -142,6 +142,8 @@
제품코드 |
폐기수량 |
유효기간 |
+ 제조번호 |
+ 일련번호 |
유통단위 수량 |
낱개단위 수량 |
@@ -155,6 +157,8 @@
{PRDUCT_CD} |
{DSUSE_QY} {PCE_UNIT} |
{PRD_VALID_DE} |
+ {MNF_NO} |
+ {MNF_SEQ} |
{MIN_DISTB_QY} {MIN_DISTB_UNIT} |
{PCE_QY} {PCE_UNIT} |