|
@@ -1,6 +1,6 @@
|
|
package com.sd.wln.service.impl;
|
|
package com.sd.wln.service.impl;
|
|
|
|
|
|
-import cn.hutool.core.date.DateUtil;
|
|
|
|
|
|
+import cn.hutool.core.convert.Convert;
|
|
import cn.hutool.core.util.StrUtil;
|
|
import cn.hutool.core.util.StrUtil;
|
|
import com.alibaba.fastjson2.JSONObject;
|
|
import com.alibaba.fastjson2.JSONObject;
|
|
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
|
|
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
|
|
@@ -128,6 +128,8 @@ public class WLnSalesReturnStockInServiceImpl implements WlnSalesReturnStockInSe
|
|
// 出库单明细
|
|
// 出库单明细
|
|
OrderExchange orderExchange = null;
|
|
OrderExchange orderExchange = null;
|
|
|
|
|
|
|
|
+ String thCode = CodeEnum.TH_CODE.getCode();
|
|
|
|
+
|
|
for (JSONObject itemDetails : detailsList) {
|
|
for (JSONObject itemDetails : detailsList) {
|
|
AfterSaleOrder afterSaleOrder = afterSaleOrderMap.get(itemDetails.getString("sku_no"));
|
|
AfterSaleOrder afterSaleOrder = afterSaleOrderMap.get(itemDetails.getString("sku_no"));
|
|
if (afterSaleOrder == null) {
|
|
if (afterSaleOrder == null) {
|
|
@@ -166,12 +168,12 @@ public class WLnSalesReturnStockInServiceImpl implements WlnSalesReturnStockInSe
|
|
})
|
|
})
|
|
.reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
.reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
|
|
|
- // 新增出库单数据
|
|
|
|
|
|
+ // 新增售后单数据
|
|
if (orderExchange == null) {
|
|
if (orderExchange == null) {
|
|
orderExchange = new OrderExchange();
|
|
orderExchange = new OrderExchange();
|
|
orderExchange.setId(IdWorker.getId());
|
|
orderExchange.setId(IdWorker.getId());
|
|
orderExchange.setOrderInfoId(orderInfo.getId());
|
|
orderExchange.setOrderInfoId(orderInfo.getId());
|
|
- orderExchange.setCode(CodeEnum.TH_CODE.getCode());
|
|
|
|
|
|
+ orderExchange.setCode(thCode);
|
|
orderExchange.setWarehouseId(WarehouseConstant.FINISHED_PRODUCT);
|
|
orderExchange.setWarehouseId(WarehouseConstant.FINISHED_PRODUCT);
|
|
orderExchange.setType(StatusConstant.YES);
|
|
orderExchange.setType(StatusConstant.YES);
|
|
orderExchange.setStatus(StatusConstant.NO);
|
|
orderExchange.setStatus(StatusConstant.NO);
|
|
@@ -180,6 +182,9 @@ public class WLnSalesReturnStockInServiceImpl implements WlnSalesReturnStockInSe
|
|
orderExchange.setCompletionTime(item.getDate("modify_time"));
|
|
orderExchange.setCompletionTime(item.getDate("modify_time"));
|
|
orderExchange.setCompletionTimestamp(item.getLong("modify_time"));
|
|
orderExchange.setCompletionTimestamp(item.getLong("modify_time"));
|
|
orderExchangeList.add(orderExchange);
|
|
orderExchangeList.add(orderExchange);
|
|
|
|
+ // 递增售后单号
|
|
|
|
+ Integer codeNumber = Convert.toInt(thCode.split("-")[2]);
|
|
|
|
+ thCode = thCode.substring(0, thCode.lastIndexOf("-") + 1) + String.format("%06d", codeNumber + 1);
|
|
}
|
|
}
|
|
OrderExchangeDetail orderExchangeDetail = new OrderExchangeDetail();
|
|
OrderExchangeDetail orderExchangeDetail = new OrderExchangeDetail();
|
|
orderExchangeDetail.setOrderExchangeId(orderExchange.getId());
|
|
orderExchangeDetail.setOrderExchangeId(orderExchange.getId());
|
|
@@ -192,6 +197,7 @@ public class WLnSalesReturnStockInServiceImpl implements WlnSalesReturnStockInSe
|
|
.add(packagingMaterialCost)).multiply(orderExchangeDetail.getQuantity()));
|
|
.add(packagingMaterialCost)).multiply(orderExchangeDetail.getQuantity()));
|
|
orderExchangeDetailList.add(orderExchangeDetail);
|
|
orderExchangeDetailList.add(orderExchangeDetail);
|
|
|
|
|
|
|
|
+ afterSaleOrder.setStatus(StatusConstant.YES);
|
|
editAfterSaleOrderIdList.add(afterSaleOrder.getId());
|
|
editAfterSaleOrderIdList.add(afterSaleOrder.getId());
|
|
}
|
|
}
|
|
}
|
|
}
|