添加结束入库

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/WmsServiceImpl.java

@@ -1,5 +1,8 @@
 package com.fjhx.victoriatourist.service;
 
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.fjhx.victoriatourist.entity.abnormal.po.AbnormalInfo;
+import com.fjhx.victoriatourist.service.abnormal.AbnormalInfoService;
 import com.fjhx.victoriatourist.service.order.OrderInfoService;
 import com.fjhx.wms.entity.stock.dto.StockWaitDetailsDto;
 import com.fjhx.wms.entity.stock.dto.StockWaitDto;
@@ -10,7 +13,10 @@ import org.springframework.stereotype.Service;
 @Service
 public class WmsServiceImpl implements WmsService {
     @Autowired
-    OrderInfoService orderInfoService;
+    private OrderInfoService orderInfoService;
+    @Autowired
+    private AbnormalInfoService abnormalInfoService;
+
     /**
      * 销售订单出库
      */
@@ -23,4 +29,16 @@ public class WmsServiceImpl implements WmsService {
     public void outbounds(StockWaitDto stockWaitDto) {
         orderInfoService.outbounds(stockWaitDto);
     }
+
+    @Override
+    public void addEndInStockAbnormal(Long linkId, String linkCode) {
+        AbnormalInfo abnormalInfo = new AbnormalInfo();
+        abnormalInfo.setStatus(0);
+        abnormalInfo.setId(IdWorker.getId());
+        abnormalInfo.setType(50);//结束入库
+        abnormalInfo.setLinkId(linkId);
+        abnormalInfo.setLinkCode(linkCode);
+        abnormalInfo.setTitle("待入库被手动结束");
+        abnormalInfoService.save(abnormalInfo);
+    }
 }

hx-wms/src/main/java/com/fjhx/wms/controller/stock/StockWaitController.java

@@ -1,16 +1,19 @@
 package com.fjhx.wms.controller.stock;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.wms.entity.stock.dto.StockWaitDetailsDto;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.wms.entity.stock.vo.StockWaitVo;
-import com.fjhx.wms.entity.stock.dto.StockWaitSelectDto;
 import com.fjhx.wms.entity.stock.dto.StockWaitDto;
-import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.fjhx.wms.entity.stock.dto.StockWaitSelectDto;
+import com.fjhx.wms.entity.stock.vo.StockWaitVo;
 import com.fjhx.wms.service.stock.StockWaitService;
+import com.ruoyi.common.core.domain.BaseSelectDto;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 
 /**
@@ -18,7 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
  * 待出入库 前端控制器
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-03-22
  */
 @DS(SourceConstant.WMS)
@@ -94,4 +97,12 @@ public class StockWaitController {
         stockWaitService.delete(dto.getId());
     }
 
+    /**
+     * 结束入库
+     */
+    @PostMapping("/endInStock")
+    public void endInStock(@RequestBody StockWaitSelectDto dto) {
+        stockWaitService.endInStock(dto.getId());
+    }
+
 }

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

@@ -14,4 +14,9 @@ public interface WmsService {
      * 销售订单出库多条
      */
     void outbounds(StockWaitDto stockWaitDto);
+
+    /**
+     * 添加结束入库异常
+     */
+    void addEndInStockAbnormal(Long linkId, String linkCode);
 }

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

@@ -60,4 +60,9 @@ public interface StockWaitService extends BaseService<StockWait> {
     void delete(Long id);
 
     Integer getStockJournalType(int businessType);
+
+    /**
+     * 结束入库
+     */
+    void endInStock(Long id);
 }

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

@@ -9,6 +9,7 @@ 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.common.constant.SourceConstant;
+import com.fjhx.common.utils.Assert;
 import com.fjhx.item.entity.product.po.ProductInfo;
 import com.fjhx.item.service.product.ProductInfoService;
 import com.fjhx.wms.entity.arrival.po.ArrivalStockRecords;
@@ -108,8 +109,8 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
         wrapper.eq(StockWait::getStatus, dto.getStatus());
         wrapper.eq("sw", StockWait::getBusinessType, dto.getBusinessType());
 
-        //过滤掉待入库待出库已完成数据
-        wrapper.ne("sw", StockWait::getStatus, 2);
+        //过滤掉待出入库 已完成/手动结束 的数据
+        wrapper.notIn("sw", StockWait::getStatus, 2, 3);
 
         Page<StockWaitVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
 
@@ -351,4 +352,17 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
         }
     }
 
+    /**
+     * 结束入库
+     */
+    @DSTransactional
+    @Override
+    public void endInStock(Long id) {
+        StockWait stockWait = getById(id);
+        Assert.notEmpty(stockWait, "无法查询到待入库信息");
+        stockWait.setStatus(3);//设置状态为结束
+        updateById(stockWait);
+        wmsService.addEndInStockAbnormal(stockWait.getId(), stockWait.getBusinessCode());
+    }
+
 }