|
|
@@ -6,28 +6,27 @@ import java.util.Collection;
|
|
|
import java.util.Date;
|
|
|
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
-
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
-import com.gagaframework.web.parameter.GagaMap;
|
|
|
-import com.gagaframework.web.util.GagaDateUtil;
|
|
|
-import com.gagaframework.web.rest.server.GagaResponseStatus;
|
|
|
import com.gagaframework.excel.GagaExcelUtil;
|
|
|
import com.gagaframework.excel.env.GagaExcelConstants;
|
|
|
+import com.gagaframework.web.parameter.GagaMap;
|
|
|
+import com.gagaframework.web.rest.server.GagaResponseStatus;
|
|
|
+import com.gagaframework.web.util.GagaDateUtil;
|
|
|
import com.gagaframework.web.util.GagaStringUtil;
|
|
|
import com.style24.core.biz.dao.TscOrderChangeDao;
|
|
|
import com.style24.core.biz.dao.TscOrderDao;
|
|
|
-import com.style24.core.support.message.TscMessageByLocale;
|
|
|
-import com.style24.core.support.env.TscConstants.OrderDetailStat;
|
|
|
import com.style24.core.biz.thirdparty.HansaeErp;
|
|
|
-
|
|
|
-import com.style24.scm.biz.dao.TssPosDao;
|
|
|
-import com.style24.scm.support.security.session.TssSession;
|
|
|
+import com.style24.core.support.env.TscConstants;
|
|
|
+import com.style24.core.support.env.TscConstants.OrderDetailStat;
|
|
|
+import com.style24.core.support.message.TscMessageByLocale;
|
|
|
+import com.style24.persistence.domain.Erp;
|
|
|
import com.style24.persistence.domain.Order;
|
|
|
import com.style24.persistence.domain.Pos;
|
|
|
-import com.style24.persistence.domain.Erp;
|
|
|
+import com.style24.scm.biz.dao.TssPosDao;
|
|
|
+import com.style24.scm.support.security.session.TssSession;
|
|
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
|
|
@@ -515,8 +514,7 @@ public class TssPosService {
|
|
|
pos.setDelvArGb("");
|
|
|
pos.setUpdNo(userNo);
|
|
|
posDao.updateOrderDetail(pos);
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
// 주문상세 이력 삽입
|
|
|
Order order = new Order();
|
|
|
order.setOrdDtlNo(pos.getOrdDtlNo());
|
|
|
@@ -531,7 +529,11 @@ public class TssPosService {
|
|
|
ordItem.setRegNo(userNo);
|
|
|
ordItem.setOrdDtlStat(""); // ???
|
|
|
ordItem.setOrdDtlItemSq(data.getOrdDtlItemSq());
|
|
|
- orderChangeDao.createOrderDetailItemHst(ordItem);
|
|
|
+ //orderChangeDao.createOrderDetailItemHst(ordItem);
|
|
|
+
|
|
|
+ // 2021.06.25 POS 배송중 (정산구분값추가)
|
|
|
+ order.setOrdDtlStat(TscConstants.OrdDtlItemStat.SALE_SHIPPING.value());
|
|
|
+ orderDao.createOrderDetailItemHst(order);
|
|
|
}
|
|
|
|
|
|
return result;
|
tsit14