增加agv库区出库

肖超群
1 parent 45986749
Showing 8 changed files with 267 additions and 58 deletions
ant-design-vue-jeecg/src/api/api.js
ant-design-vue-jeecg/src/views/system/shipment/ShipmentContainerHeaderList.vue
ant-design-vue-jeecg/src/views/system/shipment/modules/CreateShipmentTaskByAgvModal.vue
ant-design-vue-jeecg/src/views/system/shipment/modules/createShipmentTaskAndAgvTaskModal.vue
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/controller/ShipmentCombinationController.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/service/IShipmentCombinationService.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/service/impl/ShipmentCombinationServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/agvTask/service/impl/AgvTaskServiceImpl.java
@@ -276,6 +276,10 @@ export const qualityInventoryDetail = (params) =&gt; postAction(&#39;/inventory/invento
 export const qualityRegister = (params) => postAction('/task/taskHeader/qualityRegister', params);
 //创建出库任务,AGV去接
 export const createShipmentTaskByAgv = (params) => postAction('/shipment/shipmentCombination/createShipmentTaskByAgv', params);
+//批量创建出库任务,AGV去接
+export const createBatchShipmentTaskByAgv = (params) => postAction('/shipment/shipmentCombination/createBatchShipmentTaskByAgv', params);
+//创建出库任务和AGV去接
+export const createShipmentTaskAndAgvTask = (params) => postAction('/shipment/shipmentCombination/createShipmentTaskAndAgvTask', params);
  
 // 中转HTTP请求
 export const transitRESTful = {
@@ -122,9 +122,9 @@
         </span>
  
         <span slot="action" slot-scope="text, record">
-<!--          <a v-if="record.status == 0 && record.zoneType =='A'" @click="selectPort(record)"><a-button type="primary">生成任务</a-button><a-divider type="vertical"/></a>-->
-          <a v-if="record.status == 0 && record.zoneType =='L'" @click="selectPort(record)"><a-button type="primary">生成任务</a-button><a-divider type="vertical"/></a>
-<!--                    <a v-if="record.status == 0 && record.zoneType =='L'" @click="openCreateShipmentTaskAgv(record)"><a-button type="primary">生成任务</a-button><a-divider type="vertical"/></a>-->
+          <a v-if="record.status == 0 && record.zoneType =='A'" @click="openCreateShipmentTaskAndAgvTask(record)"><a-button type="primary">生成任务</a-button><a-divider type="vertical"/></a>
+<!--          <a v-if="record.status == 0 && record.zoneType =='L'" @click="selectPort(record)"><a-button type="primary">生成任务</a-button><a-divider type="vertical"/></a>-->
+                    <a v-if="record.status == 0 && record.zoneType =='L'" @click="openCreateShipmentTaskAgv(record)"><a-button type="primary">生成任务</a-button><a-divider type="vertical"/></a>
           <a-popconfirm v-if="record.status == 0" v-has="'shipmentContainerHeader:delete'" title="确定取消配盘吗?" @confirm="() => handleDelete(record.id)">
              <a><a-button type="danger">取消配盘</a-button> <a-divider type="vertical"/></a>
           </a-popconfirm>
@@ -142,6 +142,7 @@
     <shipmentContainerHeader-modal ref="modalForm" @ok="modalFormOk"></shipmentContainerHeader-modal>
     <shipmentContainerSelect-modal ref="modalForm2" @ok="modalFormOk"></shipmentContainerSelect-modal>
     <createShipmentTaskByAgv-modal ref="modalForm3" @ok="modalFormOk"></createShipmentTaskByAgv-modal>
+    <createShipmentTaskAndAgvTask-modal ref="modalForm4" @ok="modalFormOk"></createShipmentTaskAndAgvTask-modal>
   </a-card>
 </template>
  
@@ -157,11 +158,13 @@ import {createShipmentTask, execute, getCompanyList, getCustomerList, getShipmen
 import {selectSortingPort, createShipmentTaskByAgv} from '@/api/api'
 import ShipmentContainerSelectModal from "./modules/ShipmentContainerSelectModal";
 import CreateShipmentTaskByAgvModal from "./modules/CreateShipmentTaskByAgvModal";
+import CreateShipmentTaskAndAgvTaskModal from "@views/system/shipment/modules/createShipmentTaskAndAgvTaskModal";
  
 export default {
   name: "ShipmentContainerHeaderList",
   mixins: [JeecgListMixin],
   components: {
+    CreateShipmentTaskAndAgvTaskModal,
     CreateShipmentTaskByAgvModal,
     ShipmentContainerSelectModal,
     ShipmentContainerDetailList,
@@ -349,17 +352,9 @@ export default {
       this.$refs.modalForm3.edit(record);
       this.$refs.modalForm3.title = "选择出库口";
     },
-    createShipmentTaskByAgv(record) {
-      this.loading = true;
-      createShipmentTaskByAgv(record).then((res) => {
-        this.loading = false;
-        if (res.success) {
-          this.$message.success(res.message);
-        } else {
-          this.$message.error(res.message);
-        }
-        this.searchQuery();
-      });
+    openCreateShipmentTaskAndAgvTask(record) {
+      this.$refs.modalForm4.edit(record);
+      this.$refs.modalForm4.title = "选择出库口";
     },
     createBatchTask() {
       if (this.selectedRowKeys.length <= 0) {
@@ -430,7 +425,7 @@ export default {
     },
     solutionZoneCode(value) {
       var actions = []
-      console.log("solutionZoneCode " + this.zoneList);
+      // console.log("solutionZoneCode " + this.zoneList);
       Object.keys(this.zoneList).some((key) => {
         if (this.zoneList[key].code == ('' + value)) {
           actions.push(this.zoneList[key].name)
@@ -25,8 +25,8 @@
               </a-select>
             </a-form-model-item>
             <a-col :span="24">
-              <a-form-model-item label="去向工位" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toAgvPort">
-                <a-input v-model="model.toAgvPort" placeholder="请输入去向工位" style="width: 100%"/>
+              <a-form-model-item label="去向位置" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toAgvPort">
+                <a-input v-model="model.toAgvPort" placeholder="请输入去向位置" style="width: 100%"/>
               </a-form-model-item>
             </a-col>
           </a-col>
@@ -40,7 +40,7 @@
  
 import {httpAction} from '@/api/manage'
 import {validateDuplicateValue} from '@/utils/util'
-import {createShipmentTask, createShipmentTaskByAgv, createShipmentBatchTask} from '@/api/api'
+import {createShipmentTask, createShipmentTaskByAgv, createShipmentBatchTask, createBatchShipmentTaskByAgv} from '@/api/api'
 import {selectSortingPort} from '@/api/api'
  
 export default {
@@ -111,7 +111,7 @@ export default {
               x["toPort"]=that.model.toPort;
               x["toAgvPort"]=that.model.toAgvPort;
             })
-            createShipmentBatchTask(this.shipmentContainerHeaderList).then((res) => {
+            createBatchShipmentTaskByAgv(this.shipmentContainerHeaderList).then((res) => {
               if (res.success) {
                 that.$message.success(res.message);
                 that.$emit('ok');
+<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="toAgvPort">
+                <a-input v-model="model.toAgvPort" 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 {createShipmentTaskAndAgvTask, createBatchShipmentTaskByAgv} from '@/api/api'
+import {selectSortingPort} from '@/api/api'
+
+export default {
+  name: "createShipmentTaskAndAgvTaskModal",
+  components: {},
+  props: {
+    mainId: {
+      type: String,
+      required: false,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      flag:'0',
+      shipmentContainerHeaderList:[],
+      title: "操作",
+      width: 500,
+      visible: false,
+      model: {},
+      labelCol: {
+        xs: {span: 24},
+        sm: {span: 5},
+      },
+      wrapperCol: {
+        xs: {span: 24},
+        sm: {span: 16},
+      },
+
+      confirmLoading: false,
+      validatorRules: {},
+      url: {
+        createTask: "/shipment/shipmentContainerHeader/createShipmentTask",
+      }
+
+    }
+  },
+  created() {
+    //备份model原始值
+    this.modelDefault = JSON.parse(JSON.stringify(this.model));
+  },
+  methods: {
+    add() {
+      this.edit(this.modelDefault);
+    },
+    edit(record) {
+      this.visible = true;
+      this.model = Object.assign({}, record);
+      this.flag='0';
+    },
+    batchEdit(record) {
+      this.visible = true;
+      this.flag='1';
+      this.shipmentContainerHeaderList=record;
+    },
+    close() {
+      this.$emit('close');
+      this.visible = false;
+      this.$refs.form.clearValidate();
+    },
+    handleOk() {
+      const that = this;
+      if (this.flag=='1'){
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            this.shipmentContainerHeaderList.forEach(x=>{
+              x["toAgvPort"]=that.model.toAgvPort;
+            })
+            createBatchShipmentTaskByAgv(this.shipmentContainerHeaderList).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
+          }
+        })
+
+      }else{
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            createShipmentTaskAndAgvTask(this.model).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()
+    },
+
+  }
+}
+</script>
@@ -124,9 +124,9 @@ public class ShipmentCombinationController {
     @ApiOperation(value = "出库组盘-批量创建出库任务", notes = "出库组盘-批量创建出库任务")
     @PostMapping("/createShipmentBatchTask")
     @ResponseBody
-    public Result createShipmentBatchTask(@RequestBody List<ShipmentContainerHeader> shipmentContainerHeaderLiat, HttpServletRequest req) {
+    public Result createShipmentBatchTask(@RequestBody List<ShipmentContainerHeader> shipmentContainerHeaderList, HttpServletRequest req) {
         String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
-        for (ShipmentContainerHeader shipmentContainerHeader : shipmentContainerHeaderLiat) {
+        for (ShipmentContainerHeader shipmentContainerHeader : shipmentContainerHeaderList) {
             Result result = huahengMultiHandlerService.createShipmentTask(shipmentContainerHeader, warehouseCode, 0, 0, 0);
             if (!result.isSuccess()) {
                 return result;
@@ -249,11 +249,30 @@ public class ShipmentCombinationController {
     @ResponseBody
     public Result createShipmentTaskByAgv(@RequestBody ShipmentContainerHeader shipmentContainerHeader, HttpServletRequest req) {
         String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
-        Result result = shipmentCombinationService.createShipmentTask(shipmentContainerHeader, QuantityConstant.TASK_TYPE_WHOLESHIPMENT, warehouseCode, 0, 0, 0);
+        Result result = shipmentCombinationService.createShipmentTaskByAgv(shipmentContainerHeader, warehouseCode);
         return result;
     }
  
     /**
+     * 立库区
+     * 批量创建出库任务, 出库任务完成以后，AGV去接
+     * @return
+     */
+    @ApiOperation(value = "创建出库任务, 出库任务完成以后，AGV去接", notes = "创建出库任务, 出库任务完成以后，AGV去接")
+    @PostMapping("/createBatchShipmentTaskByAgv")
+    @ResponseBody
+    public Result createBatchShipmentTaskByAgv(@RequestBody List<ShipmentContainerHeader> shipmentContainerHeaderList, HttpServletRequest req) {
+        String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
+        for (ShipmentContainerHeader shipmentContainerHeader : shipmentContainerHeaderList) {
+            Result result = shipmentCombinationService.createShipmentTask(shipmentContainerHeader, QuantityConstant.TASK_TYPE_WHOLESHIPMENT, warehouseCode, 0, 0, 0);
+            if (!result.isSuccess()) {
+                return result;
+            }
+        }
+        return Result.OK("批量创建出库任务成功");
+    }
+
+    /**
      * AGV库区
      * 同时创建出库任务和AGV任务
      * @return
@@ -263,8 +282,7 @@ public class ShipmentCombinationController {
     @ResponseBody
     public Result createShipmentTaskAndAgvTask(@RequestBody ShipmentContainerHeader shipmentContainerHeader, HttpServletRequest req) {
         String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
-        Result result = shipmentCombinationService.createShipmentTask(shipmentContainerHeader, QuantityConstant.TASK_TYPE_WHOLESHIPMENT, warehouseCode, 0, 0, 0);
-
+        Result result = shipmentCombinationService.createShipmentTaskAndAgvTask(shipmentContainerHeader, QuantityConstant.TASK_TYPE_WHOLESHIPMENT, warehouseCode);
         return result;
     }
 }
@@ -31,6 +31,10 @@ public interface IShipmentCombinationService {
     Result createShipmentTask(ShipmentContainerHeader shipmentContainerHeader, int forceTaskType, String warehouseCode, long shipmentOrder, int sequence,
         int sequenceNumber);
  
+    Result createShipmentTaskByAgv(ShipmentContainerHeader shipmentContainerHeader, String warehouseCode);
+
+    Result createShipmentTaskAndAgvTask(ShipmentContainerHeader shipmentContainerHeader, int force, String warehouseCode);
+
     Result getInventoryFromShipmentDetail(Integer shipmentDetailId);
  
     Result combination(CombinationModel combinationModel);
@@ -39,6 +39,8 @@ 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;
 import org.jeecg.modules.wms.shipment.shipmentHeader.service.IShipmentHeaderService;
+import org.jeecg.modules.wms.task.agvTask.entity.AgvTask;
+import org.jeecg.modules.wms.task.agvTask.service.IAgvTaskService;
 import org.jeecg.modules.wms.task.taskHeader.entity.TaskDetail;
 import org.jeecg.modules.wms.task.taskHeader.entity.TaskHeader;
 import org.jeecg.modules.wms.task.taskHeader.entity.TaskLockEntity;
@@ -118,6 +120,8 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
  
     @Resource
     private WcsService wcsService;
+    @Resource
+    private IAgvTaskService agvTaskService;
  
     /**
      * 根据出库单详情，匹配到可用出库的库存详情
@@ -937,10 +941,7 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
             taskHeader.setInnernalTaskType(QuantityConstant.TASK_INTENERTYPE_SHIPMENT);
             taskHeader.setZoneCode(zoneCode);
             taskHeader.setShipmentOrder(shipmentOrder);
-            if (StringUtils.isNotEmpty(toAgvPort)) {
-                taskHeader.setToAgvPort(toAgvPort);
-                taskHeader.setCreateAgvTask(QuantityConstant.AGV_CREATE_NEED);
-            }
+            taskHeader.setToAgvPort(toAgvPort);
             taskHeader.setSequence(sequence);
             taskHeader.setSequenceNumber(sequenceNumber);
             taskHeader.setWarehouseCode(warehouseCode);
@@ -1023,6 +1024,58 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
  
     @Override
     @Transactional(rollbackFor = JeecgBootException.class)
+    public Result createShipmentTaskByAgv(ShipmentContainerHeader shipmentContainerHeader, String warehouseCode) {
+        Result result = shipmentCombinationService.createShipmentTask(shipmentContainerHeader, QuantityConstant.TASK_TYPE_WHOLESHIPMENT, warehouseCode, 0, 0, 0);
+        String containerCode = shipmentContainerHeader.getContainerCode();
+        TaskHeader taskHeader = taskHeaderService.getUnCompleteTaskByContainerCode(containerCode, warehouseCode);
+        if (taskHeader == null) {
+            throw new JeecgBootException("创建出库任务时，没有找到任务");
+        }
+        TaskHeader taskHeader1 = new TaskHeader();
+        taskHeader1.setId(taskHeader.getId());
+        taskHeader1.setCreateAgvTask(QuantityConstant.AGV_CREATE_NEED);
+        if (!taskHeaderService.updateById(taskHeader1)) {
+            throw new JeecgBootException("创建出库任务时，更新任务标记失败");
+        }
+        return result;
+    }
+
+    @Override
+    @Transactional(rollbackFor = JeecgBootException.class)
+    public Result createShipmentTaskAndAgvTask(ShipmentContainerHeader shipmentContainerHeader, int forceTaskType, String warehouseCode) {
+        Result result = shipmentCombinationService.createShipmentTask(shipmentContainerHeader, forceTaskType, warehouseCode);
+        if (!result.isSuccess()) {
+            throw new JeecgBootException(result.getMessage());
+        }
+        String containerCode = shipmentContainerHeader.getContainerCode();
+        String zoneCode = shipmentContainerHeader.getZoneCode();
+        String fromPortCode = shipmentContainerHeader.getFromLocationCode();
+        String toPortCode = shipmentContainerHeader.getToAgvPort();
+        AgvTask agvTask = new AgvTask();
+        agvTask.setWarehouseCode(warehouseCode);
+        agvTask.setZoneCode(zoneCode);
+        agvTask.setTaskType(QuantityConstant.AGV_TYPE_TAKE_AND_RELEASE);
+        agvTask.setStatus(QuantityConstant.AGV_TASK_STATUS_BUILD);
+        agvTask.setContainerCode(containerCode);
+        agvTask.setFromPort(fromPortCode);
+        agvTask.setToPort(toPortCode);
+        agvTask.setPriority(10);
+        result = agvTaskService.addAgvTask(agvTask, warehouseCode);
+        TaskHeader taskHeader = taskHeaderService.getUnCompleteTaskByContainerCode(containerCode, warehouseCode);
+        if (taskHeader == null) {
+            throw new JeecgBootException("创建出库任务时，没有找到任务");
+        }
+        TaskHeader taskHeader1 = new TaskHeader();
+        taskHeader1.setId(taskHeader.getId());
+        taskHeader1.setAgvTaskId(agvTask.getId());
+        if (!taskHeaderService.updateById(taskHeader1)) {
+            throw new JeecgBootException("创建出库任务时，更新任务标记失败");
+        }
+        return result;
+    }
+
+    @Override
+    @Transactional(rollbackFor = JeecgBootException.class)
     public Result getInventoryFromShipmentDetail(Integer shipmentDetailId) {
         ShipmentDetail shipmentDetail = shipmentDetailService.getById(shipmentDetailId);
         if (shipmentDetail == null) {
@@ -115,36 +115,27 @@ public class AgvTaskServiceImpl extends ServiceImpl&lt;AgvTaskMapper, AgvTask&gt; impl
             throw new JeecgBootException("完成AGV任务时，根据容器编码没有找到容器");
         }
         TaskHeader taskHeader = taskHeaderService.getTaskHeaderByAgvTaskId(agvTask.getId());
-        if (taskHeader == null) {
-            Location fromLocation = locationService.getLocationByCode(fromPort, warehouseCode);
-            if (fromLocation != null) {
-                success =
-                    locationService.updateContainerCodeAndStatus(fromPort, QuantityConstant.EMPTY_STRING, QuantityConstant.STATUS_LOCATION_EMPTY, warehouseCode);
-                if (!success) {
-                    throw new JeecgBootException("完成AGV任务时，更新起始库位数据失败");
-                }
-            } else {
-                fromPort = QuantityConstant.EMPTY_STRING;
-            }
-            Location toLocation = locationService.getLocationByCode(toPort, warehouseCode);
-            if (toLocation != null) {
-                success = locationService.updateContainerCodeAndStatus(toPort, containerCode, QuantityConstant.STATUS_LOCATION_EMPTY, warehouseCode);
-                if (!success) {
-                    throw new JeecgBootException("完成AGV任务时，更新终点库位数据失败");
-                }
-            } else {
-                toPort = QuantityConstant.EMPTY_STRING;
-            }
-            success = containerService.updateLocationCodeAndStatus(containerCode, toPort, QuantityConstant.STATUS_CONTAINER_EMPTY, warehouseCode);
-            if (!success) {
-                throw new JeecgBootException("完成AGV任务时，更新容器数据失败");
-            }
-        } else {
-            success = containerService.updateLocationCode(containerCode, toPort, warehouseCode);
-            if (!success) {
-                throw new JeecgBootException("完成AGV任务时，更新容器数据失败");
-            }
-        }
+//        if (taskHeader == null) {
+//            Location fromLocation = locationService.getLocationByCode(fromPort, warehouseCode);
+//            if (fromLocation != null) {
+//                success =
+//                    locationService.updateContainerCodeAndStatus(fromPort, QuantityConstant.EMPTY_STRING, QuantityConstant.STATUS_LOCATION_EMPTY, warehouseCode);
+//                if (!success) {
+//                    throw new JeecgBootException("完成AGV任务时，更新起始库位数据失败");
+//                }
+//            } else {
+//                fromPort = QuantityConstant.EMPTY_STRING;
+//            }
+//            Location toLocation = locationService.getLocationByCode(toPort, warehouseCode);
+//            if (toLocation != null) {
+//                success = locationService.updateContainerCodeAndStatus(toPort, containerCode, QuantityConstant.STATUS_LOCATION_EMPTY, warehouseCode);
+//                if (!success) {
+//                    throw new JeecgBootException("完成AGV任务时，更新终点库位数据失败");
+//                }
+//            } else {
+//                toPort = QuantityConstant.EMPTY_STRING;
+//            }
+//        }
         agvTask.setStatus(QuantityConstant.TASK_STATUS_COMPLETED);
         success = updateById(agvTask);
         if (!success) {