增加配盘界面

肖超群
1 parent 992ab8b4
Showing 8 changed files with 265 additions and 9 deletions
jeecg-boot-master/ant-design-vue-jeecg/src/api/api.js
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderList.vue
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/shipment/ShipmentDetailList.vue
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/shipment/modules/ShipmentDetailCombineModal.vue
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/receipt/receiving/controller/ReceiveController.java
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/entity/Shipment.java
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/service/impl/ShipmentCombinationServiceImpl.java
@@ -161,6 +161,10 @@ export const getPrintContainer = (params)=&gt;postAction(&#39;/config/container/getPrin
 export const getPrintLocation = (params)=>postAction('/config/location/getPrintContent?ids=' + params, params);
 //获取物料打印数据
 export const getMaterialLocation = (params)=>postAction('/config/material/getPrintContent?ids=' + params, params);
+//根据出库单头ID查询出库单详情
+export const listShipmentByShipmentDetailId = (params)=>postAction('/shipment/shipmentCombination/listShipmentByShipmentDetailId', params);
+//获取物料打印数据
+export const getInventoryFromShipmentDetail = (params)=>postAction('/shipment/shipmentCombination/getInventoryFromShipmentDetail?id=' + params, params);
  
 // 中转HTTP请求
 export const transitRESTful = {
@@ -163,7 +163,7 @@
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
           <a-divider type="vertical" />
-          <a @click="receive(record)">收货</a>
+          <a v-if="record.lastStatus < 800" @click="receive(record)">组盘</a>
           <a-divider type="vertical" />
           <a-dropdown>
             <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
@@ -352,7 +352,7 @@
       },
       receive(record){
         this.$refs.modalForm2.edit(record);
-        this.$refs.modalForm2.title = "收货";
+        this.$refs.modalForm2.title = "组盘";
       },
       clickThenSelect(record) {
         return {
@@ -62,6 +62,8 @@
         </template>
  
         <span slot="action" slot-scope="text, record">
+          <a @click="combine(record)">配盘</a>
+          <a-divider type="vertical" />
           <a @click="edit(record)">编辑</a>
           <a-divider type="vertical" />
           <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
@@ -74,6 +76,8 @@
  
     <shipmentDetail-modal ref="modalForm" @ok="modalFormOk" :mainId="mainId"></shipmentDetail-modal>
     <shipment-detail-edit-modal ref="modalEditForm" @ok="modalFormOk" :mainId="mainId"></shipment-detail-edit-modal>
+    <shipment-detail-combine-modal ref="modalCombineForm" @ok="modalFormOk" :mainId="mainId"></shipment-detail-combine-modal>
+
   </a-card>
 </template>
  
@@ -82,11 +86,12 @@
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import ShipmentDetailModal from './modules/ShipmentDetailModal'
   import ShipmentDetailEditModal from './modules/ShipmentDetailEditModal'
+  import ShipmentDetailCombineModal from './modules/ShipmentDetailCombineModal'
  
   export default {
     name: "ShipmentDetailList",
     mixins:[JeecgListMixin],
-    components: { ShipmentDetailEditModal, ShipmentDetailModal },
+    components: { ShipmentDetailCombineModal, ShipmentDetailEditModal, ShipmentDetailModal },
     props:{
       mainId:{
         type:String,
@@ -218,6 +223,11 @@
         this.selectedRowKeys=[]
         this.ipagination.current = 1
       },
+      combine (record) {
+        this.$refs.modalCombineForm.edit(record);
+        this.$refs.modalCombineForm.title = "配盘";
+        this.$refs.modalCombineForm.disableSubmit = false;
+      },
       edit (record) {
         this.$refs.modalEditForm.edit(record);
         this.$refs.modalEditForm.title = "编辑";
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    switchFullscreen
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <a-spin :spinning="confirmLoading">
+      <a-form-model ref="form" :model="model" :rules="validatorRules">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="物料编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="materialCode">
+              <a-input v-model="model.materialCode"placeholder="请输入物料编码" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="物料名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="materialName">
+              <a-input v-model="model.materialName"placeholder="请输入物料名称" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="可出数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="qty">
+              <a-input-number v-model="model.qty"placeholder="请输入可出数量" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="出库数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="taskQty">
+              <a-input-number v-model="model.taskQty"placeholder="请输入出库数量" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </a-spin>
+  </j-modal>
+</template>
+
+<script>
+
+  import { httpAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+  import {searchMaterialByCode, getInventoryFromShipmentDetail} from '@/api/api'
+  import {listShipmentByShipmentDetailId} from '@/api/api'
+
+  export default {
+    name: "ShipmentDetailCombineModal",
+    components: {
+    },
+    props:{
+      mainId:{
+        type:String,
+        required:false,
+        default:''
+      }
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        /* 数据源 */
+        dataSource:[],
+        visible: false,
+        materialList:{},
+        querySource:{},
+        model:{
+        },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/shipment/shipmentHeader/addShipmentDetail",
+          edit: "/shipment/shipmentHeader/editShipmentDetail",
+        }
+
+      }
+    },
+    created () {
+    //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+      this.searchMaterial();
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+        this.model.inventoryStatus =  "good";
+      },
+      edit (record) {
+        // this.model = Object.assign({}, record);
+        this.searchShipment(record);
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+        this.$refs.form.clearValidate();
+      },
+      searchShipment(record) {
+        const that = this;
+        that.querySource = record;
+        listShipmentByShipmentDetailId(that.querySource).then((res) => {
+          this.model = res.result;
+          this.visible = true;
+        });
+        getInventoryFromShipmentDetail(that.querySource.id).then((res) => {
+          this.dataSource = res.result;
+        });
+      },
+      handleOk () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            this.model['shipmentId'] = this.mainId
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+              that.close();
+            })
+          }else{
+             return false
+          }
+        })
+      },
+      handleCancel () {
+        this.close()
+      },
+      searchMaterial() {
+        const that = this;
+        that.querySource.materialCode = that.model.materialCode;
+        console.log("model.materialCode:" + that.model.materialCode);
+        searchMaterialByCode(that.querySource).then((res) => {
+          that.materialList = res.result;
+        })
+      },
+
+    }
+  }
+</script>
@@ -37,10 +37,11 @@ public class ReceiveController {
     private IReceiveService receiveService;
  
     /**
-     * 通过主表ID查询
+     * 通过详情ID查询
      * @return
      */
-    @ApiOperation(value="入库单详情-通过主表ID查询", notes="入库单详情-通过主表ID查询")
+    @AutoLog("入库单详情-通过详情ID查询")
+    @ApiOperation(value="入库单详情-通过详情ID查询", notes="入库单详情-通过详情ID查询")
     @PostMapping("/listReceiveByReceiptId")
     @ResponseBody
     public Result listReceiveByReceiptId(@RequestBody ReceiptDetail receiptDetailDomain) {
 package org.jeecg.modules.wms.shipment.shipmentCombination.controller;
  
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.modules.wms.config.location.entity.Location;
 import org.jeecg.modules.wms.config.location.service.ILocationService;
@@ -15,8 +17,10 @@ import org.jeecg.modules.wms.config.port.service.IPortService;
 import org.jeecg.modules.wms.config.zone.entity.Zone;
 import org.jeecg.modules.wms.config.zone.service.IZoneService;
 import org.jeecg.modules.wms.receipt.receiptContainerHeader.entity.ReceiptContainerHeader;
+import org.jeecg.modules.wms.receipt.receiptHeader.entity.ReceiptDetail;
 import org.jeecg.modules.wms.receipt.receiptHeader.entity.ReceiptHeader;
 import org.jeecg.modules.wms.receipt.receiving.domain.Receive;
+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.shipmentHeader.entity.ShipmentDetail;
@@ -28,6 +32,8 @@ import org.springframework.web.bind.annotation.*;
  
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
  
 /**
@@ -37,7 +43,7 @@ import java.util.List;
 @RestController
 @RequestMapping("/shipment/shipmentCombination")
 @Slf4j
-public class shipmentCombinationController {
+public class ShipmentCombinationController {
  
     @Resource
     private IShipmentDetailService shipmentDetailService;
@@ -143,7 +149,31 @@ public class shipmentCombinationController {
     @PostMapping("/getInventoryFromShipmentDetail")
     @ResponseBody
     public Result getInventoryFromShipmentDetail(@RequestParam(name="id",required=true) Integer id, HttpServletRequest req) {
-
         return shipmentCombinationService.getInventoryFromShipmentDetail(id);
     }
+
+    /**
+     * 通过详情ID查询
+     * @return
+     */
+    @AutoLog("出库单详情-通过详情ID查询")
+    @ApiOperation(value="出库单详情-通过详情ID查询", notes="出库单详情-通过详情ID查询")
+    @PostMapping("/listShipmentByShipmentDetailId")
+    @ResponseBody
+    public Result listShipmentByShipmentDetailId(@RequestBody ShipmentDetail shipmentDetail) {
+        Shipment shipment = new Shipment();
+        shipment.setId(shipmentDetail.getId());
+        shipment.setMaterialCode(shipmentDetail.getMaterialCode());
+        shipment.setMaterialName(shipmentDetail.getMaterialName());
+        //计算待收数量
+        BigDecimal qty = shipmentDetail.getQty().subtract(shipmentDetail.getTaskQty());
+        if(qty.compareTo(BigDecimal.ZERO) < 0) {
+            return Result.error("待收数量小于0");
+        }
+        //可出数量
+        shipment.setQty(qty);
+        //锁定数量
+        shipment.setTaskQty(BigDecimal.ZERO);
+        return Result.ok(shipment);
+    }
 }
+package org.jeecg.modules.wms.shipment.shipmentCombination.entity;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author 游杰
+ */
+@Data
+public class Shipment {
+
+    private Integer id;
+    private String materialCode;
+    private String materialName;
+    private BigDecimal qty;    //可收数量
+    private BigDecimal taskQty;    //实收数量
+
+
+}
@@ -561,8 +561,35 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
         List<InventoryDetail> removeInventoryList = new ArrayList<>();
         for(InventoryDetail inventoryDetail : inventoryDetailList) {
             String containerCode = inventoryDetail.getContainerCode();
-            Container container =
+            Container container = containerService.getContainerByCode(containerCode, warehouseCode);
+            if(container == null) {
+                return Result.error("没有找到容器，容器号" + containerCode);
+            }
+            if(container.getStatus().equals(QuantityConstant.STATUS_CONTAINER_LOCK)) {
+                removeInventoryList.add(inventoryDetail);
+            }
+        }
+        List<ReceiptContainerHeader> unCompleteCombineList =
+                receiptContainerHeaderService.getUnCompleteCombineList();
+        if(unCompleteCombineList != null && unCompleteCombineList.size() > 0) {
+            for(ReceiptContainerHeader receiptContainerHeader : unCompleteCombineList) {
+                String containerCode = receiptContainerHeader.getContainerCode();
+                for(InventoryDetail item : inventoryDetailList) {
+                    if(containerCode.equals(item.getContainerCode())) {
+                        if(!removeInventoryList.contains(item)) {
+                            removeInventoryList.add(item);
+                        }
+                        break;
+                    }
+                }
+            }
+        }
+        if(removeInventoryList.size() > 0) {
+            boolean success = inventoryDetailList.removeAll(removeInventoryList);
+            if (!success) {
+                throw new ServiceException("移除库存失败");
+            }
         }
-        return null;
+        return Result.ok(inventoryDetailList);
     }
 }