|
|
@@ -125,7 +125,7 @@ public class TssGoodsController extends TssBaseController {
|
|
|
mav.addObject("goodsStatList", rendererService.getCommonCodeList("G008", "Y", exceptCds));
|
|
|
|
|
|
// 상품상태
|
|
|
- String[] statChangeExceptCds = {"G008_00", "G008_90"};
|
|
|
+ String[] statChangeExceptCds = {"G008_00"};
|
|
|
mav.addObject("goodsStatChangeList", rendererService.getCommonCodeList("G008", "Y", statChangeExceptCds));
|
|
|
// 정상이월
|
|
|
mav.addObject("formalGbList", rendererService.getAvailCommonCodeList("G009"));
|
|
|
@@ -251,6 +251,7 @@ public class TssGoodsController extends TssBaseController {
|
|
|
// result.set("message", message.getMessage("SUCC_0001"));
|
|
|
|
|
|
String returnGoods = "";
|
|
|
+ String returnGoods2 = ""; // 최초승인일 없는 상품체크
|
|
|
String resultFlag = "SUCC";
|
|
|
|
|
|
// 입점 담당자만 일괄 변경 가능
|
|
|
@@ -259,11 +260,11 @@ public class TssGoodsController extends TssBaseController {
|
|
|
}
|
|
|
|
|
|
// 상품 상태 변경일 경우 체크
|
|
|
- if ("goodsStat".equals(goods.getProcJob()) && ("G008_40".equals(goods.getGoodsStat()))) {
|
|
|
+ if ("goodsStat".equals(goods.getProcJob())
|
|
|
+ && (("G008_40".equals(goods.getGoodsStat())) || ("G008_90".equals(goods.getGoodsStat())))) {
|
|
|
|
|
|
// 이미지
|
|
|
Collection<Goods> goodsList = goodsService.getGoodsImgsYn(goods);
|
|
|
-
|
|
|
for (Goods tmpGoods : goodsList) {
|
|
|
if ("N".equals(tmpGoods.getGoodsImageYn())) {
|
|
|
returnGoods += tmpGoods.getGoodsCd() + ",";
|
|
|
@@ -305,6 +306,14 @@ public class TssGoodsController extends TssBaseController {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ // 최초승인일 체크
|
|
|
+ if ("G008_90".equals(goods.getGoodsStat())) {
|
|
|
+ if (StringUtils.isBlank(dataGoods.getFrstCfrmDt())) {
|
|
|
+ returnGoods2 += tmpGoods.getGoodsCd() + ",";
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -312,10 +321,23 @@ public class TssGoodsController extends TssBaseController {
|
|
|
returnGoods = returnGoods.substring(0, returnGoods.lastIndexOf(","));
|
|
|
//returnGoods = returnGoods.replaceAll(",", ",<br/>");
|
|
|
resultFlag = "FAIL";
|
|
|
+ result.set("resultType", "0");
|
|
|
result.set("resultFlag", resultFlag);
|
|
|
result.set("returnGoods", returnGoods);
|
|
|
return result;
|
|
|
}
|
|
|
+
|
|
|
+ // 승인완료로 변경 시 최초승인일이 있는경우만 변경가능
|
|
|
+ if ("G008_90".equals(goods.getGoodsStat())) {
|
|
|
+ if (returnGoods2.length() > 0) {
|
|
|
+ returnGoods2 = returnGoods2.substring(0, returnGoods2.lastIndexOf(","));
|
|
|
+ resultFlag = "FAIL";
|
|
|
+ result.set("resultType", "90");
|
|
|
+ result.set("resultFlag", resultFlag);
|
|
|
+ result.set("returnGoods", returnGoods2);
|
|
|
+ return result;
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
goodsService.updateGoodsState(goods);
|