|
@@ -109,20 +109,24 @@ public class TsaOrderChangeController extends TsaBaseController {
|
|
|
|
|
|
|
|
// 1. 취소가능 주문상세상탭값 설정
|
|
// 1. 취소가능 주문상세상탭값 설정
|
|
|
if (TscConstants.OrderChangeStat.CANCEL.value().equals(chgStat)) {
|
|
if (TscConstants.OrderChangeStat.CANCEL.value().equals(chgStat)) {
|
|
|
- String[] ordDtlStatArr = new String[5];
|
|
|
|
|
|
|
+ String[] ordDtlStatArr = new String[6];
|
|
|
ordDtlStatArr[0] = TscConstants.OrderDetailStat.DEPOSIT_WAIT.value();
|
|
ordDtlStatArr[0] = TscConstants.OrderDetailStat.DEPOSIT_WAIT.value();
|
|
|
ordDtlStatArr[1] = TscConstants.OrderDetailStat.PAYMENT_COMPLETE.value();
|
|
ordDtlStatArr[1] = TscConstants.OrderDetailStat.PAYMENT_COMPLETE.value();
|
|
|
ordDtlStatArr[2] = TscConstants.OrderDetailStat.GOODS_PREPARE.value();
|
|
ordDtlStatArr[2] = TscConstants.OrderDetailStat.GOODS_PREPARE.value();
|
|
|
ordDtlStatArr[3] = TscConstants.OrderDetailStat.DELIVERY_PREPARE.value();
|
|
ordDtlStatArr[3] = TscConstants.OrderDetailStat.DELIVERY_PREPARE.value();
|
|
|
ordDtlStatArr[4] = TscConstants.OrderDetailStat.SHIPPING.value();
|
|
ordDtlStatArr[4] = TscConstants.OrderDetailStat.SHIPPING.value();
|
|
|
|
|
+ // 2021.10.08 출고처정 상태값 추가
|
|
|
|
|
+ ordDtlStatArr[5] = TscConstants.OrderDetailStat.DELIVERY_LOC_ASSIGN.value();
|
|
|
|
|
|
|
|
order.setOrdDtlStatArr(ordDtlStatArr);
|
|
order.setOrdDtlStatArr(ordDtlStatArr);
|
|
|
} else {
|
|
} else {
|
|
|
- String[] ordDtlStatArr = new String[4];
|
|
|
|
|
|
|
+ String[] ordDtlStatArr = new String[5];
|
|
|
ordDtlStatArr[0] = TscConstants.OrderDetailStat.DEPOSIT_WAIT.value();
|
|
ordDtlStatArr[0] = TscConstants.OrderDetailStat.DEPOSIT_WAIT.value();
|
|
|
ordDtlStatArr[1] = TscConstants.OrderDetailStat.PAYMENT_COMPLETE.value();
|
|
ordDtlStatArr[1] = TscConstants.OrderDetailStat.PAYMENT_COMPLETE.value();
|
|
|
ordDtlStatArr[2] = TscConstants.OrderDetailStat.GOODS_PREPARE.value();
|
|
ordDtlStatArr[2] = TscConstants.OrderDetailStat.GOODS_PREPARE.value();
|
|
|
ordDtlStatArr[3] = TscConstants.OrderDetailStat.DELIVERY_PREPARE.value();
|
|
ordDtlStatArr[3] = TscConstants.OrderDetailStat.DELIVERY_PREPARE.value();
|
|
|
|
|
+ // 2021.10.08 출고처정 상태값 추가
|
|
|
|
|
+ ordDtlStatArr[4] = TscConstants.OrderDetailStat.DELIVERY_LOC_ASSIGN.value();
|
|
|
|
|
|
|
|
order.setOrdDtlStatArr(ordDtlStatArr);
|
|
order.setOrdDtlStatArr(ordDtlStatArr);
|
|
|
}
|
|
}
|