快速出库功能实现

xcq
1 parent dee99599
Showing 9 changed files with 325 additions and 5 deletions
ant-design-vue-jeecg/src/api/api.js
ant-design-vue-jeecg/src/views/system/monitor/locationStatus.vue
ant-design-vue-jeecg/src/views/system/monitor/modules/ExpressDeliveryModal.vue
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/framework/service/IHuahengMultiHandlerService.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/framework/service/impl/HuahengMultiHandlerServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/entity/FlatShipment.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentHeader/controller/ShipmentHeaderController.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentHeader/entity/ShipmentDetail.java
huaheng-wms-core/src/main/resources/application-test.yml
@@ -262,6 +262,8 @@ export const quickReceipt = (params) =&gt; postAction(&quot;/task/taskHeader/quickReceip
 export const shipmentInventoryHeader = (params) => postAction('/inventory/inventoryHeader/shipmentInventoryHeader', params);
 //快速出库，批量快速出库存详情
 export const shipmentInventoryDetail = (params) => postAction('/inventory/inventoryHeader/shipmentInventoryDetail', params);
+// 快速出库,通过库存ID
+export const autoShipmentByID = (params) => postAction('/shipment/shipmentHeader/autoShipmentByID', params);
 //呼叫入库托盘
 export const callReceiptBox = (params) => postAction('/receipt/receiptHeader/callbox', params);
 //批量呼叫入库托盘
@@ -304,6 +306,8 @@ export const batchCreateCheckOut = (params) =&gt; postAction(&#39;/task/taskHeader/batc
 export const addInventoryDetail = (params) => postAction('/inventory/inventoryDetail/addInventoryDetail', params);
 //扣减库存数量
 export const reduceInventoryDetail = (params) => postAction('/inventory/inventoryDetail/reduceInventoryDetail', params);
+// 根据库位编码查询库存详情
+export const getInventoryDetailByLocationCode = (params) => getAction('/inventory/inventoryDetail/list', params);
  
 // 中转HTTP请求
 export const transitRESTful = {
 <template>
+  <a-card :bordered="false">
   <div class="container-div">
     <div class="row">
       <div class="col-sm-12 select-info">
@@ -30,6 +31,12 @@
               <li>
                 <a-button type="primary" @click="Search()" icon="search">查询</a-button>
               </li>
+              <li>
+                <a-button  @click='expressDelivery()' v-if="this.visible" type='primary'>快速出库</a-button>
+              </li>
+              <li>
+                <a-button  @click="quickReceipt()" type="primary">快速入库</a-button>
+              </li>
             </ul>
           </div>
         </form>
@@ -78,6 +85,10 @@
  
     </div>
   </div>
+
+    <MaterialTaskModal ref="materialTaskModal" @ok="modalFormOk"></MaterialTaskModal>
+    <ExpressDeliveryModal ref="ExpressDeliveryModal" @ok="modalFormOk"></ExpressDeliveryModal>
+  </a-card>
 </template>
  
 <script>
@@ -119,16 +130,29 @@ import grid_all_lock from &#39;@/assets/icon/grid_all_lock.png&#39;
 import rel_empty from '@/assets/icon/rel_empty.png'
 import Vue from 'vue'
 import {ACCESS_TOKEN} from "@/store/mutation-types"
-import {getZoneList} from '@/api/api'
+import {getInventoryDetailByLocationCode, getZoneList} from '@/api/api'
+import MaterialTaskModal from "../task/modules/MaterialTaskModal";
+import ExpressDeliveryModal from "@views/system/monitor/modules/ExpressDeliveryModal";
+import {JeecgListMixin} from '@/mixins/JeecgListMixin'
+
  
 export default {
   name: "locationStatus",
   zoneCode: "",
+  // parameter:{
+  //   code:'',
+  // } ,
+  mixins: [JeecgListMixin],
+  components: {
+    MaterialTaskModal,
+    ExpressDeliveryModal
+  },
   data() {
     return {
       spinning: true,
       loading: true,
       showPrise: false,
+      visible: false,
       // loading:true,
       zoneCode: '',
       zoneList: [],
@@ -301,7 +325,45 @@ export default {
         return ""
       }
     },
+    // 快速入库
+    quickReceipt(){
+      this.$refs.materialTaskModal.edit();
+    },
+    // 获取库存信息
+    getInventory(locationCode){
+      let params = {
+        locationCode: locationCode
+      }
+      getInventoryDetailByLocationCode(params).then((res) => {
+        if (res.success) {
+          let parameter = [];
+          let newArr = res.result.records;
+          for(var i of newArr){
+            var param = {
+              materialCode: i.materialCode,
+              shipQty: i.qty,
+              inventoryDetailId: i.id,
+            }
+            parameter.push(param);
+          }
+          this.$refs.ExpressDeliveryModal.edit(parameter);
+        } else {
+          this.$message.error(res.message);
+        }
+      });
+    },
+    //快速出库
+    expressDelivery(){
+      this.getInventory(currentLocationCode);
  
+    },
+    revealExpressDelivery(code, materialCode){
+      if (materialCode){
+        this.visible = true;
+      }else {
+        this.visible = false;
+      }
+    },
  
     //关闭tips
     Mclose(x) {
@@ -481,6 +543,7 @@ export default {
       if (list_info) {//缓存查询
         for (let i = 0; i < list_info.length; i++) {
           if (list_info[i].row === row && list_info[i].icolumn === line && list_info[i].layer === layers) {
+            let materialCode = '';
             if (list_info[i].materialName) {
               let list_batch = '';
               let list_qty = 0;
@@ -494,6 +557,7 @@ export default {
                   $("#material").append("<option>" + str_info + "</option>");
                 }
                 currentMaterialCode = list_info[i].materialCode[j]
+                materialCode = list_info[i].materialCode[j];
               }
             } else {
               $("#material").children().remove();
@@ -503,6 +567,8 @@ export default {
             $("#containerCode").val(list_info[i].containerCode === "" ? "无" : list_info[i].containerCode);
             currentContainerCode = $("#containerCode").val()
             currentLocationCode = $("#code").val()
+            this.revealExpressDelivery(list_info[i].code,materialCode);
+            break;
           }
         }
       } else {
+<template>
+  <a-modal
+    :title="title"
+    :width="800"
+    :visible="visible"
+    :maskClosable="false"
+    :confirmLoading="confirmLoading"
+    @ok="handleOk"
+    @cancel="handleCancel">
+
+    <a-spin :spinning="confirmLoading">
+      <a-form-model ref="form" :label-col="labelCol" :wrapper-col="wrapperCol" :model="model">
+      <a-tabs defaultActiveKey="1">
+        <a-tab-pane tab="物料信息" key="1">
+          <div>
+            <a-row type="flex" style="margin-bottom:10px" :gutter="24">
+              <a-col :span="12">物料编码</a-col>
+              <a-col :span="8">数量</a-col>
+              <a-col :span="4">操作</a-col>
+            </a-row>
+            <a-row type="flex" style="margin-bottom:-20px" :gutter="24" v-for="(item, index) in quickMainModel.receiptEntityList" :key="index">
+              <a-col style="display: none">
+                <a-form-model-item>
+                  <a-input placeholder="inventoryDetailId" v-model="item.inventoryDetailId"/>
+                </a-form-model-item>
+              </a-col>
+              <a-col :span="12">
+                <a-form-model-item>
+                  <j-search-select-tag
+                    :disabled="isSearch"
+                    placeholder="请选择"
+                    v-model="item.materialCode"
+                    :dict="'material,name,code'"
+                    :pageSize="5"
+                    :async="true">
+                  </j-search-select-tag>
+                </a-form-model-item>
+              </a-col>
+              <a-col :span="8">
+                <a-form-model-item>
+                  <a-input placeholder="数量" v-model="item.shipQty"/>
+                </a-form-model-item>
+              </a-col>
+              <a-col :span="4">
+                <a-form-model-item>
+                  <a-icon type="minus-circle" @click="delRowCustom(index)" style="fontSize :20px"/>
+                </a-form-model-item>
+              </a-col>
+            </a-row>
+<!--            <a-button type="dashed" style="width: 100%;margin-top: 10px" @click="addRowCustom"><a-icon type="plus"/>添加出库信息</a-button>-->
+          </div>
+        </a-tab-pane>
+      </a-tabs>
+      </a-form-model>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+
+import JEditableTable from '@/components/jeecg/JEditableTable'
+import {execute, autoShipmentByID} from '@/api/api'
+import JDate from '@/components/jeecg/JDate'
+import JSelectMultiCanUseContainer from "../../../../components/jeecgbiz/JSelectMultiCanUseContainer";
+
+
+export default {
+  name: 'ExpressDeliveryModal',
+  components: {
+    JDate, JEditableTable,JSelectMultiCanUseContainer
+  },
+  data() {
+    return {
+      title: '快速出库',
+      visible: false,
+      confirmLoading: false,
+      model: {},
+      isSearch:true,
+      labelCol: {
+        xs: {span: 24},
+        sm: {span: 4}
+      },
+      wrapperCol: {
+        xs: {span: 24},
+        sm: {span: 24}
+      },
+      activeKey: '1',
+      quickMainModel: {
+        receiptEntityList: [{}],
+        inventoryDetailList: []
+      },
+      // 客户信息
+      url: {
+        add: '/test/jeecgOrderMain/add',
+        edit: '/test/jeecgOrderMain/edit',
+      }
+    }
+  },
+  created() {
+  },
+  methods: {
+    handleOk() {
+      this.validateFields()
+    },
+    handleCancel() {
+      this.visible = false
+    },
+
+    addRowCustom() {
+      this.quickMainModel.receiptEntityList.push({});
+      this.$forceUpdate();
+    },
+    delRowCustom(index) {
+      console.log(index)
+      this.quickMainModel.receiptEntityList.splice(index, 1);
+      this.$forceUpdate();
+    },
+    addRowTicket() {
+      this.quickMainModel.jeecgOrderTicketList.push({});
+      console.log(this.quickMainModel.jeecgOrderTicketList)
+      this.$forceUpdate();
+    },
+    delRowTicket(index) {
+      console.log(index)
+      this.quickMainModel.jeecgOrderTicketList.splice(index, 1);
+      this.$forceUpdate();
+    },
+
+    edit(record) {
+      this.visible = true;
+      this.activeKey = '1';
+      this.quickMainModel = Object.assign({
+        receiptEntityList: record
+      }, record);
+    },
+    /** 触发表单验证 */
+    validateFields() {
+      // 触发表单验证
+      this.$refs.form.validate(valid => {
+        this.receipt(this.quickMainModel);
+      })
+    },
+
+    receipt(record) {
+      debugger
+      this.confirmLoading = true
+      this.model = Object.assign({}, record);
+      autoShipmentByID(record.receiptEntityList).then((res) => {
+        this.loading = false;
+        if (res.success) {
+          this.$message.success(res.message);
+          this.$emit('ok');
+          this.visible = false
+        } else {
+          this.$message.error(res.message);
+        }
+        this.confirmLoading = false
+      });
+    },
+  }
+}
+</script>
 \ No newline at end of file
@@ -8,6 +8,7 @@ import org.jeecg.modules.wms.api.mobile.entity.QuickReceiptBean;
 import org.jeecg.modules.wms.receipt.receiptContainerHeader.entity.ReceiptContainerHeader;
 import org.jeecg.modules.wms.receipt.receiptHeader.entity.ReceiptHeader;
 import org.jeecg.modules.wms.shipment.shipmentCombination.entity.CombinationModel;
+import org.jeecg.modules.wms.shipment.shipmentCombination.entity.FlatShipment;
 import org.jeecg.modules.wms.shipment.shipmentContainerHeader.entity.ShipmentContainerHeader;
 import org.jeecg.modules.wms.shipment.shipmentHeader.entity.CombinationParam;
 import org.jeecg.modules.wms.shipment.shipmentHeader.entity.ShipmentHeader;
@@ -54,4 +55,9 @@ public interface IHuahengMultiHandlerService {
  
     void sendTaskToWcs(List<TaskHeader> taskHeaders, String warehouseCode, String zoneCode);
  
+    /**
+     * 通过详情ID查询库存详情
+     */
+    Result autoShipmentByIDService(List<FlatShipment> flatShipmentList, String warehouseCode);
+
 }
 package org.jeecg.modules.wms.framework.service.impl;
  
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
  
 import javax.annotation.Resource;
  
@@ -18,6 +22,8 @@ import org.jeecg.modules.wms.receipt.receiptContainerHeader.entity.ReceiptContai
 import org.jeecg.modules.wms.receipt.receiptContainerHeader.service.IReceiptContainerHeaderService;
 import org.jeecg.modules.wms.receipt.receiptHeader.entity.ReceiptHeader;
 import org.jeecg.modules.wms.shipment.shipmentCombination.entity.CombinationModel;
+import org.jeecg.modules.wms.shipment.shipmentCombination.entity.FlatShipment;
+import org.jeecg.modules.wms.shipment.shipmentCombination.entity.Shipment;
 import org.jeecg.modules.wms.shipment.shipmentCombination.service.IShipmentCombinationService;
 import org.jeecg.modules.wms.shipment.shipmentContainerHeader.entity.ShipmentContainerHeader;
 import org.jeecg.modules.wms.shipment.shipmentContainerHeader.service.IShipmentContainerHeaderService;
@@ -28,10 +34,12 @@ import org.jeecg.modules.wms.shipment.shipmentHeader.service.IShipmentDetailServ
 import org.jeecg.modules.wms.shipment.shipmentHeader.service.IShipmentHeaderService;
 import org.jeecg.modules.wms.task.taskHeader.entity.TaskHeader;
 import org.jeecg.modules.wms.task.taskHeader.service.ITaskHeaderService;
+import org.jeecg.utils.constant.QuantityConstant;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
  
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.transaction.annotation.Transactional;
  
 /**
  * @author 游杰
@@ -67,6 +75,7 @@ public class HuahengMultiHandlerServiceImpl extends HuahengBaseController implem
     @Resource
     private IErpService erpService;
  
+
     @Override
     public Result sendTaskToWcs(TaskHeader taskHeader, String zoneCode) {
         if (taskHeader == null) {
@@ -104,6 +113,63 @@ public class HuahengMultiHandlerServiceImpl extends HuahengBaseController implem
     }
  
     @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Result autoShipmentByIDService(List<FlatShipment> flatShipmentList, String warehouseCode) {
+        // 校验库存id参数
+        if (flatShipmentList == null || flatShipmentList.size() == 0) {
+            return Result.error("参数不能为空");
+        }
+        for (FlatShipment item :flatShipmentList){
+            if (item.getInventoryDetailId() == null) {
+                return Result.error("库存ID不能为空");
+            }
+            if (item.getShipQty() == null || item.getShipQty().compareTo(BigDecimal.ZERO) == 0){
+                return Result.error("出库数量不能为空");
+            }
+        }
+        // 通过库存ID查询库存详情数据
+        List<InventoryDetail> inventoryDetailList = inventoryDetailService.listByIds(flatShipmentList.stream().map(FlatShipment::getInventoryDetailId).collect(Collectors.toList()));
+        if (inventoryDetailList == null || inventoryDetailList.size() == 0){
+            return Result.error("根据库存ID查询库存信息失败!");
+        }
+        // 根据库存详情创建出库单
+        Map<Integer, InventoryDetail> inventoryDetailMap = inventoryDetailList.stream().collect(Collectors.toMap(InventoryDetail::getId, Function.identity()));
+        ShipmentHeader shipmentHeader = new ShipmentHeader();
+        shipmentHeader.setWarehouseCode(warehouseCode);
+        shipmentHeader.setType(QuantityConstant.SHIPMENT_BILL_TYPE_QTC);
+        shipmentHeader.setZoneCode(QuantityConstant.ZONE_TYPE_FLAT);
+        shipmentHeader.setCompanyCode(inventoryDetailList.get(0).getCompanyCode());
+        Result result = shipmentHeaderService.saveShipmentHeader(shipmentHeader);
+        if (!result.isSuccess()){
+            return result;
+        }
+        List<ShipmentDetail> shipmentDetailList = new ArrayList<>();
+        for (FlatShipment item : flatShipmentList){
+            InventoryDetail inventoryDetail = inventoryDetailMap.get(item.getInventoryDetailId());
+            ShipmentDetail shipmentDetail = new ShipmentDetail();
+            shipmentDetail.setShipmentId(shipmentHeader.getId());
+            shipmentDetail.setQty(item.getShipQty());
+            shipmentDetail.setMaterialCode(inventoryDetail.getMaterialCode());
+            shipmentDetail.setMaterialName(inventoryDetail.getMaterialName());
+            shipmentDetail.setInventoryStatus(inventoryDetail.getInventoryStatus());
+            shipmentDetail.setShipmentCode(shipmentHeader.getCode());
+            shipmentDetail.setInventoryDetailId(item.getInventoryDetailId());
+            shipmentDetail.setCompanyCode(shipmentHeader.getCompanyCode());
+            result = shipmentDetailService.saveShipmentDetail(shipmentDetail);
+            if (!result.isSuccess()){
+                throw new RuntimeException(result.getMessage());
+            }
+            shipmentDetailList.add(shipmentDetail);
+        }
+        // 将出库单详情转换为map存储
+        Map<Integer, ShipmentDetail> shipmentDetailMap = shipmentDetailList.stream().collect(Collectors.toMap(ShipmentDetail::getInventoryDetailId, Function.identity()));
+        for (FlatShipment item : flatShipmentList){
+            item.setShipmentDetailId(shipmentDetailMap.get(item.getInventoryDetailId()).getId());
+        }
+        return shipmentCombinationService.flatShipmentByContainerCode(inventoryDetailList.get(0).getContainerCode(), flatShipmentList, warehouseCode);
+    }
+
+    @Override
     public Result createReceiptTask(ReceiptContainerHeader receiptContainerHeader, String warehouseCode) {
         Result result = handleMultiProcess("createReceiptTask", warehouseCode, new MultiProcessListener() {
             @Override
@@ -14,5 +14,6 @@ public class FlatShipment {
     private String locationCode;
     private Integer shipmentDetailId;
     private BigDecimal shipQty;
+    private Integer inventoryDetailId;
  
 }
@@ -25,6 +25,7 @@ import org.jeecg.modules.wms.api.mobile.service.IMobileService;
 import org.jeecg.modules.wms.framework.service.IHuahengMultiHandlerService;
 import org.jeecg.modules.wms.inventory.inventoryHeader.entity.InventoryDetail;
 import org.jeecg.modules.wms.inventory.inventoryHeader.service.IInventoryDetailService;
+import org.jeecg.modules.wms.shipment.shipmentCombination.entity.FlatShipment;
 import org.jeecg.modules.wms.shipment.shipmentHeader.entity.ShipmentDetail;
 import org.jeecg.modules.wms.shipment.shipmentHeader.entity.ShipmentHeader;
 import org.jeecg.modules.wms.shipment.shipmentHeader.service.IShipmentDetailService;
@@ -413,6 +414,18 @@ public class ShipmentHeaderController extends JeecgController&lt;ShipmentHeader, IS
         return result;
     }
  
+    /**
+     * 平库出库，通过库存ID
+     * @return
+     */
+    @AutoLog(value = "平库出库,通过库存ID")
+    @ApiOperation(value = "平库出库,通过库存ID", notes = "平库出库,通过库存ID")
+    @PostMapping("/autoShipmentByID")
+    public Result autoShipmentByID(@RequestBody List<FlatShipment> flatShipmentList, HttpServletRequest req){
+        String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
+        return huahengMultiHandlerService.autoShipmentByIDService(flatShipmentList, warehouseCode);
+    }
+
     @AutoLog(value = "自动预配盘出库")
     @ApiOperation(value = "自动预配盘出库", notes = "自动预配盘出库")
     @PostMapping("/autoShipmentAdvice")
@@ -150,6 +150,8 @@ public class ShipmentDetail implements Serializable {
     /** 更新日期 */
     @ApiModelProperty(value = "更新日期")
     private Date updateTime;
+    @TableField(exist = false)
+    private Integer inventoryDetailId;
  
     public void setQty(BigDecimal qty) {
         if (qty.compareTo(BigDecimal.ZERO) <= 0) {
@@ -165,9 +165,9 @@ spring:
   #redis 配置
   redis:
     database: 0
-    host: 172.16.29.77
+    host: 127.0.0.1
     port: 6379
-    password: 123456
+    password: ''
     timeout: 5000 #超时时间ms
     lettuce:
       pool:
@@ -306,8 +306,8 @@ jeecg:
       data-type: database
   #分布式锁配置
   redisson:
-    address: 172.16.29.77:6379
-    password: 123456
+    address: 127.0.0.1:6379
+    password: ''
     type: STANDALONE
     enabled: true
 #cas单点登录