出库记录出库事业部

sd-business/src/main/java/com/sd/business/entity/order/po/OrderInfo.java

@@ -253,6 +253,11 @@ public class OrderInfo extends BasePo {
     private String tag;
 
     /**
+     * 出库事业部
+     */
+    private Long outDepartmentId;
+
+    /**
      * 备注
      */
     private String remark;

sd-business/src/main/java/com/sd/business/service/order/impl/OrderServiceImpl.java

@@ -17,6 +17,9 @@ import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.sd.business.entity.bom.po.Bom;
 import com.sd.business.entity.bom.po.BomSpec;
 import com.sd.business.entity.department.po.Department;
+import com.sd.business.entity.in.dto.InOutStorageDto;
+import com.sd.business.entity.in.emums.InDetailTypeEnum;
+import com.sd.business.entity.in.emums.InOutTypeEnum;
 import com.sd.business.entity.order.dto.OrderInfoDto;
 import com.sd.business.entity.order.dto.OrderSelectDto;
 import com.sd.business.entity.order.dto.OrderSkuDto;
@@ -35,6 +38,7 @@ import com.sd.business.mapper.order.OrderMapper;
 import com.sd.business.service.bom.BomService;
 import com.sd.business.service.bom.BomSpecService;
 import com.sd.business.service.department.DepartmentService;
+import com.sd.business.service.in.InOutStorageService;
 import com.sd.business.service.order.*;
 import com.sd.business.service.price.PriceBillingStandardDetailService;
 import com.sd.business.service.price.PriceBillingStandardService;
@@ -89,6 +93,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
     @Autowired
     private PriceBillingStandardDetailService priceBillingStandardDetailService;
 
+    @Autowired
+    private InOutStorageService inOutStorageService;
+
     @Override
     public Page<OrderInfoVo> getPage(OrderSelectDto dto) {
         IWrapper<OrderInfo> wrapper = getWrapper();
@@ -436,6 +443,14 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
             return;
         }
 
+        InOutStorageDto inOutStorageDto = new InOutStorageDto();
+        inOutStorageDto.setDepartmentId(orderInfo.getOutDepartmentId());
+        // inOutStorageDto.setWarehouseId(dto.getInWarehouseId());
+        inOutStorageDto.setType(InOutTypeEnum.IN.getKey());
+        inOutStorageDto.setDetailType(InDetailTypeEnum.RETURN_GOODS.getKey());
+        inOutStorageDto.setApplicant(SecurityUtils.getLoginUser().getUser().getNickName());
+        inOutStorageDto.setRemark("删除订单：" + orderInfo.getWlnCode() + " 退货入库");
+        inOutStorageService.add(inOutStorageDto);
 
     }
 

sd-business/src/main/java/com/sd/business/service/production/impl/StockPreparationServiceImpl.java

@@ -187,6 +187,7 @@ public class StockPreparationServiceImpl implements StockPreparationService {
         orderService.update(q -> q
                 .in(BaseIdPo::getId, orderIdList)
                 .set(OrderInfo::getStatus, OrderStatusEnum.IN_PRODUCTION.getKey())
+                .set(OrderInfo::getOutDepartmentId, outDepartmentId)
         );
 
         // 订单sku出库
@@ -304,7 +305,7 @@ public class StockPreparationServiceImpl implements StockPreparationService {
             outBomVo.setClassifyName(bomSpecBo.getClassifyName());
             outBomVo.setClassifyParentId(bomSpecBo.getClassifyParentId());
 
-            // 主材9
+            // 主材
             if (Objects.equals(bomSpecBo.getClassifyParentId(), 1L)) {
                 outBomVo.setWarehouseId(WarehouseConstant.SEMI_FINISHED_PRODUCT);
                 outBomVo.setWarehouseName("半成品仓");