问题处理

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/order/OrderInfoService.java

@@ -51,5 +51,8 @@ public interface OrderInfoService extends BaseService<OrderInfo> {
      */
     void outbound(StockWaitDetailsDto stockWaitDetailsDto);
 
+    /**
+     * 销售订单出库 多条
+     */
     void outbounds(StockWaitDto stockWaitDto);
 }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/order/impl/OrderInfoServiceImpl.java

@@ -5,7 +5,6 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fjhx.area.service.AreaInfoService;
 import com.fjhx.area.utils.CustomizeAreaUtil;
 import com.fjhx.common.utils.Assert;
 import com.fjhx.customer.entity.customer.po.Customer;
@@ -55,8 +54,6 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
     @Autowired
     private CustomerService customerService;
     @Autowired
-    private AreaInfoService areaInfoService;
-    @Autowired
     private OrderDetailsService orderDetailsService;
     @Autowired
     private ProductInfoService productInfoService;
@@ -74,12 +71,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
     public Page<OrderInfoVo> getPage(OrderInfoSelectDto dto) {
         IWrapper<OrderInfo> wrapper = getWrapper();
         wrapper.like(OrderInfo::getCode, dto.getKeyword());
-//        if (ObjectUtil.isEmpty(dto.getType())) {
-//            //默认销售订单
-//            wrapper.in("oi", OrderInfo::getType, 1, 2);
-//        } else {
         wrapper.eq("oi", OrderInfo::getType, dto.getType());
-//        }
         wrapper.eq("oi", OrderInfo::getStatus, dto.getStatus());//根据状态过滤
         wrapper.orderByDesc("oi", OrderInfo::getId);
         Page<OrderInfoVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
@@ -127,13 +119,6 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         List<OrderDetails> orderDetailsList = orderInfoDto.getOrderDetailsList();
         Assert.notEmpty(orderDetailsList, "订单明细不能为空");
 
-//        Integer type = orderInfoDto.getType();
-//        if (type == 3) {
-//            // 获取京东客户id
-//            Long jdCustomerId = systemConfigService.getValue(SystemConfigKeyConstant.JD_CUSTOMER_ID, Long.class);
-//            orderInfoDto.setCustomerInfoId(jdCustomerId);
-//        }
-
         // 订单时间
         orderInfoDto.setOrderTime(ObjectUtil.defaultIfNull(orderInfoDto.getOrderTime(), new Date()));
 

hx-wms/src/main/java/com/fjhx/wms/entity/stock/dto/StockWaitSelectDto.java

@@ -24,4 +24,9 @@ public class StockWaitSelectDto extends BaseSelectDto {
      */
     private Integer status;
 
+    /**
+     * 待出入库业务类型
+     */
+    private Integer businessType;
+
 }

hx-wms/src/main/java/com/fjhx/wms/service/WmsService.java

@@ -10,5 +10,8 @@ public interface WmsService {
      */
     void outbound(StockWaitDetailsDto stockWaitDetailsDto);
 
+    /**
+     * 销售订单出库多条
+     */
     void outbounds(StockWaitDto stockWaitDto);
 }

hx-wms/src/main/java/com/fjhx/wms/service/stock/impl/StockWaitServiceImpl.java

@@ -78,10 +78,11 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
     @Override
     public Page<StockWaitVo> getPage(StockWaitSelectDto dto) {
         IWrapper<StockWait> wrapper = getWrapper();
-        wrapper.orderByDesc("sw", StockWait::getId);
         //过滤入库/出库
         wrapper.eq(StockWait::getType, dto.getType());
+        wrapper.eq("sw", StockWait::getBusinessType, dto.getBusinessType());
         wrapper.eq(StockWait::getBusinessCode, dto.getKeyword());
+        wrapper.orderByDesc("sw", StockWait::getId);
         Page<StockWaitVo> page = this.baseMapper.getPage1(dto.getPage(), wrapper);
 
         List<StockWaitVo> records = page.getRecords();
@@ -221,15 +222,6 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
                 statusFlag++;
             }
         }
-
-        //操作库存
-        for (StockWaitDetails waitDetails : stockWaitDetailsDtoList) {
-            Stock stock = new Stock();
-            stock.setQuantity(waitDetails.getQuantity());
-            stock.setProductId(waitDetails.getProductId());
-            stockList.add(stock);
-        }
-
         stockWaitDetailsService.updateBatchById(stockWaitDetailss);
         //修改待入库状态
         StockWait stockWait = getById(stockWaitDto.getId());
@@ -244,6 +236,13 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
         stockWait.setVictoriatouristJson(json.toJSONString(JSONWriter.Feature.WriteLongAsString));
         updateById(stockWait);
 
+        //操作库存
+        for (StockWaitDetails waitDetails : stockWaitDetailsDtoList) {
+            Stock stock = new Stock();
+            stock.setQuantity(waitDetails.getQuantity());
+            stock.setProductId(waitDetails.getProductId());
+            stockList.add(stock);
+        }
         //创建出入库记录
         Integer businessType = stockWait.getBusinessType();
         StockJournal stockJournal = new StockJournal();
@@ -285,6 +284,7 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
         if (StockWaitType.SALE_ORDER_OUT.getDetailType().equals(businessType)) {
             wmsService.outbounds(stockWaitDto);
         }
+
         //生产任务待出库
         if (StockWaitType.PRODUCTION_TASK_OUT.getDetailType().equals(businessType)) {
             for (StockWaitDetails stockWaitDetailsDto : stockWaitDetailsDtoList) {