|
@@ -36,6 +36,7 @@ import com.sd.business.entity.order.vo.*;
|
|
|
import com.sd.business.entity.price.po.PriceBillingStandard;
|
|
|
import com.sd.business.entity.price.po.PriceBillingStandardDetail;
|
|
|
import com.sd.business.entity.sku.po.SkuSpec;
|
|
|
+import com.sd.business.entity.statement.dto.StatementOfAccountDto;
|
|
|
import com.sd.business.entity.statement.po.StatementOfAccount;
|
|
|
import com.sd.business.entity.warehouse.constant.WarehouseConstant;
|
|
|
import com.sd.business.mapper.order.OrderMapper;
|
|
@@ -514,6 +515,14 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
|
|
|
.set(BasePo::getUpdateUser, SecurityUtils.getUserId())
|
|
|
);
|
|
|
|
|
|
+ // 对已生产的订单生成对账单
|
|
|
+ if (ObjectUtil.equals(orderInfo.getStatus(), OrderStatusEnum.COMPLETION_PRODUCTION.getKey())) {
|
|
|
+ StatementOfAccountDto statement = new StatementOfAccountDto();
|
|
|
+ statement.setDepartmentId(orderInfo.getDepartmentId());
|
|
|
+ statement.setOrderIdList(Collections.singletonList(orderInfo.getId()));
|
|
|
+ statementOfAccountService.add(statement);
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
|
|
|
@DSTransactional
|
|
@@ -609,6 +618,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
|
|
|
inOutStorageService.add(packagingMaterialInOutStorageDto);
|
|
|
|
|
|
delete(id);
|
|
|
+
|
|
|
+ OrderOperatingLog orderOperatingLog = new OrderOperatingLog();
|
|
|
+ orderOperatingLog.setType(30);
|
|
|
+ orderOperatingLog.setOrderId(id);
|
|
|
+ orderOperatingLog.setOrderCode(orderInfo.getCode());
|
|
|
+ orderOperatingLogService.save(orderOperatingLog);
|
|
|
}
|
|
|
|
|
|
@Override
|