|
|
@@ -663,13 +663,14 @@ public class TsbDeliveryService {
|
|
|
data.setWdBfSendYn(chgSqInfo.getWdBfSendYn());
|
|
|
data.setWdInvoiceSendYn("Y");
|
|
|
data.setRtnLocCd("DL001");
|
|
|
+ data.setRegNo(TsbConstants.REG_NO);
|
|
|
|
|
|
// TB_ORDER_CHANGE
|
|
|
deliveryDao.updateTbOrderChange(data); // 주문변경번호 단위
|
|
|
|
|
|
|
|
|
// 교환일경우 자동 완료처리
|
|
|
- data.setRegNo(TsbConstants.REG_NO);
|
|
|
+
|
|
|
if (OrderChangeGb.EXCHANGE.value().equals(data.getChgGb())) { // 교환
|
|
|
data.setChgStat(OrderChangeStat.EXCHANGE_COMPLETE.value()); // 교환완료 G685_40
|
|
|
} else {
|
|
|
@@ -680,7 +681,7 @@ public class TsbDeliveryService {
|
|
|
|
|
|
for(Delivery dtlNo : ordDtlNoList) {
|
|
|
|
|
|
- if (999999999 == dtlNo.getOrderdtlno()) {
|
|
|
+ if (999999999 == dtlNo.getOrdDtlNo()) {
|
|
|
dtlNo.setOrderno(data.getOrderno());
|
|
|
Delivery ordDtlNo = deliveryDao.getOrdDtlno2(dtlNo);
|
|
|
dtlNo.setOrdDtlNo(ordDtlNo.getOrdDtlNo());
|
|
|
@@ -980,7 +981,7 @@ public class TsbDeliveryService {
|
|
|
Collection<Delivery> ordDtlItemList = wmsDeliveryService.getWmsOrdDtlItemList(data);
|
|
|
for(Delivery item : ordDtlItemList) {
|
|
|
|
|
|
- if (999999999 == item.getOrderdtlno()) {
|
|
|
+ if (999999999 == item.getOrdDtlNo()) {
|
|
|
item.setOrderno(data.getOrderno());
|
|
|
Delivery ordDtlNo = deliveryDao.getOrdDtlno2(item);
|
|
|
item.setOrdDtlNo(ordDtlNo.getOrdDtlNo());
|
|
|
@@ -994,6 +995,7 @@ public class TsbDeliveryService {
|
|
|
item.setOptCd1(ordInfo.getOptCd1());
|
|
|
item.setOptCd2(ordInfo.getOptCd2());
|
|
|
item.setSellStoreCd(ordInfo.getSellStoreCd());
|
|
|
+ item.setRtnLocCd("DL001");
|
|
|
// TB_WITHDRAW_DETAIL 입력
|
|
|
deliveryDao.insertTbWithdrawDetail(item); // 주문변경번호 ITEM단위
|
|
|
|
tsit05