增加越库功能

肖超群
1 parent 7d84d1e9
Showing 5 changed files with 100 additions and 1 deletions
ant-design-vue-jeecg/src/api/api.js
ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderList.vue
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/controller/ReceiptHeaderController.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/service/IReceiptHeaderService.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/service/impl/ReceiptHeaderServiceImpl.java
@@ -260,6 +260,8 @@ export const callShipmentBox = (params) =&gt; postAction(&#39;/shipment/shipmentHeader/
 export const listReceiveByReceiveId = (params) => postAction('/receipt/receiveHeader/listReceiveByReceiveId', params);
 //收货
 export const receive = (params) => postAction('/receipt/receiveHeader/receive', params);
+//越库
+export const crossDocking = (params) => postAction('/receipt/receiptHeader/crossDocking?id=' + params, params);
 // 中转HTTP请求
 export const transitRESTful = {
   get: (url, parameter) => getAction(getTransitURL(url), parameter),
@@ -178,6 +178,11 @@
         <span slot="action" slot-scope="text, record">
           <a-popconfirm v-has="'receiptHeader:back'" v-if="record.lastStatus == 800" title="确定回传吗?" @confirm="() => hanleBack(record)">
           	<a><a-button type="default">回传</a-button></a>
+            <a-divider type="vertical"/>
+          </a-popconfirm>
+          <a-popconfirm v-has="'receiptHeader:crossDocking'" v-if="record.lastStatus == 0" title="确定越库吗?" @confirm="() => hanleCross(record)">
+          	<a><a-button type="primary">越库</a-button></a>
+            <a-divider type="vertical"/>
           </a-popconfirm>
           <a v-if="(record.lastStatus < 800 && record.firstStatus >= 15 && record.firstStatus != '20') || (flowOff == '0' && record.lastStatus < 800) " @click="receive(record)" v-has="'receiptHeader:receive'">
             <a-button type="primary">组盘</a-button>
@@ -230,7 +235,7 @@ import {initDictOptions, filterMultiDictText} from &#39;@/components/dict/JDictSelec
 import '@/assets/less/TableExpand.less'
 import {getCompanyList} from '@/api/api'
 import {getReceiptTypeList} from '@/api/api'
-import {getSupplierList, backErpReceipt,createReceiptAuditFlow,getDocumentAduitFlow} from '@/api/api'
+import {getSupplierList, backErpReceipt,createReceiptAuditFlow,getDocumentAduitFlow, crossDocking} from '@/api/api'
 import ReceiptModal from "./modules/ReceiptModal";
 import { notification } from 'ant-design-vue';
 import FlowProcess from "../flow/FlowProcess";
@@ -537,6 +542,16 @@ export default {
         this.searchQuery();
       });
     },
+    hanleCross(record) {
+      crossDocking(record.id).then((res) => {
+        if (res.success) {
+          this.$message.success(res.message);
+        } else {
+          this.$message.warning(res.message);
+        }
+        this.searchQuery();
+      });
+    },
     loadFrom() {
       getCompanyList().then((res) => {
         if (res.success) {
@@ -403,4 +403,13 @@ public class ReceiptHeaderController extends JeecgController&lt;ReceiptHeader, IRec
         }
         return result;
     }
+
+    @AutoLog(value = "越库")
+    @ApiOperation(value = "越库", notes = "越库")
+    @PostMapping("/crossDocking")
+    @ResponseBody
+    @ApiLogger(apiName = "越库", from = "WMS")
+    public Result<?> crossDocking(@RequestParam(name = "id", required = true) String id, HttpServletRequest req) {
+        return receiptHeaderService.crossDocking(id);
+    }
 }
@@ -41,4 +41,5 @@ public interface IReceiptHeaderService extends IService&lt;ReceiptHeader&gt; {
  
     String createReceiptCode(String receiptType);
  
+    Result crossDocking(String id);
 }
@@ -3,6 +3,7 @@ package org.jeecg.modules.wms.receipt.receiptHeader.service.impl;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
@@ -15,6 +16,8 @@ import org.jeecg.modules.wms.audit.service.IAuditService;
 import org.jeecg.modules.wms.config.receiptType.entity.ReceiptType;
 import org.jeecg.modules.wms.config.receiptType.service.IReceiptTypeService;
 import org.jeecg.modules.wms.flow.service.IFlowDetailService;
+import org.jeecg.modules.wms.inventory.inventoryTransaction.entity.InventoryTransaction;
+import org.jeecg.modules.wms.inventory.inventoryTransaction.service.IInventoryTransactionService;
 import org.jeecg.modules.wms.receipt.receiptHeader.entity.ReceiptDetail;
 import org.jeecg.modules.wms.receipt.receiptHeader.entity.ReceiptHeader;
 import org.jeecg.modules.wms.receipt.receiptHeader.mapper.ReceiptDetailMapper;
@@ -29,6 +32,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
  
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  
@@ -60,6 +64,8 @@ public class ReceiptHeaderServiceImpl extends ServiceImpl&lt;ReceiptHeaderMapper, R
     private IFlowDetailService iFlowDetailService;
     @Resource
     private IAuditService iAuditService;
+    @Resource
+    private IInventoryTransactionService inventoryTransactionService;
  
     /**
      * @param  id     入库单主表id
@@ -148,6 +154,72 @@ public class ReceiptHeaderServiceImpl extends ServiceImpl&lt;ReceiptHeaderMapper, R
         return code;
     }
  
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Result crossDocking(String id) {
+        ReceiptHeader receiptHeader = receiptHeaderService.getById(id);
+        if (receiptHeader == null) {
+            return Result.error("越库失败，没有找到入库单头" + id);
+        }
+        List<ReceiptDetail> receiptDetailList = receiptDetailService.selectByMainId(id);
+        if (CollectionUtils.isEmpty(receiptDetailList)) {
+            return Result.error("越库失败，没有找到入库详情" + id);
+        }
+        List<InventoryTransaction> inventoryTransactionList = new ArrayList<>();
+        for (ReceiptDetail receiptDetail : receiptDetailList) {
+            BigDecimal qty = receiptDetail.getQty();
+            receiptDetail.setTaskQty(qty);
+            receiptDetail.setReceiptQty(qty);
+            receiptDetail.setStatus(QuantityConstant.RECEIPT_HEADER_COMPLETED);
+            InventoryTransaction inventoryTransaction = new InventoryTransaction();
+            inventoryTransaction.setType(QuantityConstant.INVENTORY_TRANSACTION_RECEIPT);
+            inventoryTransaction.setWarehouseCode(receiptDetail.getWarehouseCode());
+            inventoryTransaction.setCompanyCode(receiptDetail.getCompanyCode());
+            inventoryTransaction.setMaterialCode(receiptDetail.getMaterialCode());
+            inventoryTransaction.setMaterialName(receiptDetail.getMaterialName());
+            inventoryTransaction.setMaterialSpec(receiptDetail.getMaterialSpec());
+            inventoryTransaction.setMaterialUnit(receiptDetail.getMaterialUnit());
+            inventoryTransaction.setReceiptId(receiptDetail.getReceiptId());
+            inventoryTransaction.setReceiptCode(receiptHeader.getCode());
+            inventoryTransaction.setReceiptType(receiptHeader.getType());
+            inventoryTransaction.setReceiptDetailId(receiptDetail.getId());
+            inventoryTransaction.setBatch(receiptDetail.getBatch());
+            inventoryTransaction.setLot(receiptDetail.getLot());
+            inventoryTransaction.setProject(receiptDetail.getProject());
+            inventoryTransaction.setInventoryStatus(receiptDetail.getInventoryStatus());
+            inventoryTransaction.setQty(qty);
+            inventoryTransaction.setReceiptQty(qty);
+            inventoryTransactionList.add(inventoryTransaction);
+
+            inventoryTransaction = new InventoryTransaction();
+            inventoryTransaction.setType(QuantityConstant.INVENTORY_TRANSACTION_SHIPMENT);
+            inventoryTransaction.setWarehouseCode(receiptDetail.getWarehouseCode());
+            inventoryTransaction.setCompanyCode(receiptDetail.getCompanyCode());
+            inventoryTransaction.setMaterialCode(receiptDetail.getMaterialCode());
+            inventoryTransaction.setMaterialName(receiptDetail.getMaterialName());
+            inventoryTransaction.setMaterialSpec(receiptDetail.getMaterialSpec());
+            inventoryTransaction.setMaterialUnit(receiptDetail.getMaterialUnit());
+            inventoryTransaction.setInventoryStatus(receiptDetail.getInventoryStatus());
+            inventoryTransaction.setBatch(receiptDetail.getBatch());
+            inventoryTransaction.setLot(receiptDetail.getLot());
+            inventoryTransaction.setProject(receiptDetail.getProject());
+            inventoryTransaction.setQty(receiptDetail.getQty());
+            inventoryTransaction.setShipmentQty(receiptDetail.getQty());
+            inventoryTransactionList.add(inventoryTransaction);
+        }
+
+        if (!receiptDetailService.updateBatchById(receiptDetailList)) {
+            throw new JeecgBootException("越库失败,批量更新入库单详情失败");
+        }
+        if (!inventoryTransactionService.saveBatch(inventoryTransactionList)) {
+            throw new JeecgBootException("越库失败,批量保存库存交易记录失败");
+        }
+        if (!receiptHeaderService.updateReceiptHeaderStatus(Integer.parseInt(id))) {
+            throw new JeecgBootException("越库失败,批更新入库单失败");
+        }
+        return Result.ok("越库成功");
+    }
+
     /**
      * 更新入库单 头状态和尾状态
      * 头状态是单据详情中最大的状态