增加指定库位功能

肖超群
1 parent a9bce149
Showing 9 changed files with 201 additions and 14 deletions
ant-design-vue-jeecg/src/api/api.js
ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerHeaderList.vue
ant-design-vue-jeecg/src/views/system/receipt/modules/ReceiptContainerAllocationlModal.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/receipt/receiptContainerHeader/controller/ReceiptContainerHeaderController.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/service/IReceiptContainerHeaderService.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/service/impl/ReceiptContainerHeaderServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
@@ -324,6 +324,8 @@ export const flatOnShell = (params) =&gt; postAction(&quot;/receipt/receiveHeader/flatOn
 export const queryInventoryDetailListByMainIds = (params) => postAction("/inventory/inventoryDetail/getInventoryDetailListByInventoryDetailIds", params);
 //根据出库单头ID查询出库单详情
 export const getInventoryByShipmentDetail = (params) => postAction('/shipment/shipmentHeader/getInventoryByShipmentDetail', params);
+//指定库位
+export const allocation = (params) => postAction('/receipt/receiptContainerHeader/allocation', params);
  
 // 中转HTTP请求
 export const transitRESTful = {
@@ -136,7 +136,7 @@
           <a-popconfirm v-if="record.status == 0" v-has="'receiptContainerHeader:delete'" title="确定取消配盘吗?" @confirm="() => handleDelete(record.id)">
             <a><a-button type="danger">取消配盘</a-button></a>
           </a-popconfirm>
-
+          <a v-if="record.status == 0" @click="allocation(record)" v-has="'receiptContainerHeader:allocation'"><a-button type="primary">指定库位</a-button></a>
           <a v-has="'receiptContainerHeader:edit'" @click="handleEdit(record)"><a-button type="default">编辑</a-button></a>
         </span>
       </a-table>
@@ -153,6 +153,7 @@
     <receiptContainerFillSelect-modal ref="modalForm3" @ok="modalFormOk"></receiptContainerFillSelect-modal>
     <receiptContainerStatusSelect-modal ref="modalForm4" @ok="modalFormOk"></receiptContainerStatusSelect-modal>
     <receipt-container-on-shell-modal ref="modalForm5" @ok="modalFormOk"></receipt-container-on-shell-modal>
+    <receipt-container-allocationl-modal ref="modalForm6" @ok="modalFormOk"></receipt-container-allocationl-modal>
  
   </a-card>
 </template>
@@ -172,11 +173,13 @@ import ReceiptContainerFillSelectModal from &quot;./modules/ReceiptContainerFillSelec
 import ReceiptContainerStatusSelectModal from "./modules/ReceiptContainerStatusSelectModal";
 import '@/assets/less/TableExpand.less'
 import ReceiptContainerOnShellModal from "@views/system/receipt/modules/ReceiptContainerOnShellModal.vue";
+import ReceiptContainerAllocationlModal from "@views/system/receipt/modules/ReceiptContainerAllocationlModal.vue";
  
 export default {
   name: "ReceiptContainerHeaderList",
   mixins: [JeecgListMixin],
   components: {
+    ReceiptContainerAllocationlModal,
     ReceiptContainerOnShellModal,
     ReceiptContainerSelectModal,
     ReceiptContainerDetailList,
@@ -404,6 +407,10 @@ export default {
       this.$refs.modalForm5.edit(record);
       this.$refs.modalForm5.title = "平库上架";
     },
+    allocation(record) {
+      this.$refs.modalForm6.edit(record);
+      this.$refs.modalForm6.title = "指定库位";
+    },
     createBatchTask() {
       if (this.selectedRowKeys.length <= 0) {
         this.$message.warning('至少选择一条记录！')
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    switchFullscreen
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <div class="table-page-search-wrapper">
+      <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="toLocationCode">
+                  <a-input v-model="model.toLocationCode" placeholder="请输入库位编码"></a-input>
+                </a-form-model-item>
+              </a-col>
+            </a-row>
+        </a-form-model>
+      </a-spin>
+    </div>
+  </j-modal>
+</template>
+
+<script>
+
+import {httpAction} from '@/api/manage'
+import {validateDuplicateValue} from '@/utils/util'
+import {allocation, flatOnShell} from '@/api/api'
+
+export default {
+  name: "ReceiptContainerAllocationlModal",
+  components: {},
+  props: {
+    mainId: {
+      type: String,
+      required: false,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      title: "操作",
+      portList: [],
+      flag:'0',
+      width: 500,
+      visible: false,
+      model: {},
+      labelCol: {
+        xs: {span: 24},
+        sm: {span: 5},
+      },
+      wrapperCol: {
+        xs: {span: 24},
+        sm: {span: 16},
+      },
+      confirmLoading: false,
+      validatorRules: {
+        toLocationCode: [{ required: true, message: '请输入库位编码!' }]
+      },
+      url: {
+      }
+    }
+  },
+  created() {
+    //备份model原始值
+    this.modelDefault = JSON.parse(JSON.stringify(this.model));
+  },
+  methods: {
+    add() {
+      this.edit(this.modelDefault);
+    },
+    edit(record) {
+      this.model = Object.assign({}, record);
+      this.visible = true;
+    },
+    close() {
+      this.$emit('close');
+      this.visible = false;
+      this.$refs.form.clearValidate();
+    },
+    handleOk() {
+      const that = this;
+      // 触发表单验证
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          that.confirmLoading = true;
+          allocation(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>
@@ -62,10 +62,14 @@ public interface IHuahengMultiHandlerService {
  
     /**
      * 快速入库实现方法
-     * @param bean
-     * @param warehouseCode
+     * @param  bean
+     * @param  warehouseCode
      * @return
      */
     Result quickReceiptService(QuickReceiptBean bean, String warehouseCode);
  
+    /**
+     * 指定库位
+     */
+    Result allocation(ReceiptContainerHeader receiptContainerHeader);
 }
@@ -279,6 +279,17 @@ public class HuahengMultiHandlerServiceImpl extends HuahengBaseController implem
     }
  
     @Override
+    public Result allocation(ReceiptContainerHeader receiptContainerHeader) {
+        Result result = handleMultiProcess("allocation", "", new MultiProcessListener() {
+            @Override
+            public Result<?> doProcess() {
+                return receiptContainerHeaderService.allocation(receiptContainerHeader);
+            }
+        });
+        return result;
+    }
+
+    @Override
     public Result createReceiptTask(ReceiptContainerHeader receiptContainerHeader, String warehouseCode) {
         Result result = handleMultiProcess("createReceiptTask", warehouseCode, new MultiProcessListener() {
             @Override
@@ -435,4 +435,15 @@ public class ReceiptContainerHeaderController extends JeecgController&lt;ReceiptCon
         return Result.OK(portList);
     }
  
+    /**
+     * 指定库位
+     * @return
+     */
+    @AutoLog(value = "入库组盘-指定库位")
+    @ApiOperation(value = "入库组盘-指定库位", notes = "入库组盘-指定库位")
+    @RequestMapping(value = "/allocation", method = {RequestMethod.PUT, RequestMethod.POST})
+    public Result<String> allocation(@RequestBody ReceiptContainerHeader receiptContainerHeader) {
+        Result result = huahengMultiHandlerService.allocation(receiptContainerHeader);
+        return result;
+    }
 }
@@ -70,4 +70,11 @@ public interface IReceiptContainerHeaderService extends IService&lt;ReceiptContaine
      * 更新去向toPort和状态status
      */
     boolean updateToPortAndStatus(String toPort, int status, int id);
+
+    /**
+     * 更新去向toLocation
+     */
+    boolean updateToLocationById(String toLocationCode, int id);
+
+    Result allocation(ReceiptContainerHeader receiptContainerHeader);
 }
@@ -13,6 +13,7 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.modules.wms.config.container.entity.Container;
 import org.jeecg.modules.wms.config.container.service.IContainerService;
+import org.jeecg.modules.wms.config.location.entity.Location;
 import org.jeecg.modules.wms.config.location.service.ILocationService;
 import org.jeecg.modules.wms.config.parameterConfiguration.service.IParameterConfigurationService;
 import org.jeecg.modules.wms.config.zone.entity.Zone;
@@ -492,7 +493,7 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
     }
  
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public Result cancelReceiving(List<Integer> ids) {
         Result result = null;
         for (Integer id : ids) {
@@ -505,7 +506,6 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
     }
  
     @Override
-    @Transactional
     public boolean updateToPortById(String toPort, int id) {
         ReceiptContainerHeader receiptContainerHeader = new ReceiptContainerHeader();
         receiptContainerHeader.setToPort(toPort);
@@ -515,7 +515,6 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
     }
  
     @Override
-    @Transactional
     public boolean updateToPortAndStatus(String toPort, int status, int id) {
         ReceiptContainerHeader receiptContainerHeader = new ReceiptContainerHeader();
         receiptContainerHeader.setToPort(toPort);
@@ -526,6 +525,41 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
     }
  
     @Override
+    public boolean updateToLocationById(String toLocationCode, int id) {
+        ReceiptContainerHeader receiptContainerHeader = new ReceiptContainerHeader();
+        receiptContainerHeader.setToLocationCode(toLocationCode);
+        receiptContainerHeader.setId(id);
+        boolean success = receiptContainerHeaderService.updateById(receiptContainerHeader);
+        return success;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Result allocation(ReceiptContainerHeader receiptContainerHeader) {
+        String toLocationCode = receiptContainerHeader.getToLocationCode();
+        String warehouseCode = receiptContainerHeader.getWarehouseCode();
+        if (StringUtils.isEmpty(toLocationCode)) {
+            return Result.error("指定库位失败，库位编码为空");
+        }
+        if (StringUtils.isEmpty(warehouseCode)) {
+            return Result.error("指定库位失败，仓库编码为空");
+        }
+        Location toLocation = locationService.getLocationByCode(toLocationCode, warehouseCode);
+        if (toLocation == null) {
+            return Result.error("指定库位失败，没有找到库位" + toLocationCode);
+        }
+        String locationStatus = toLocation.getStatus();
+        if (locationStatus.equals(QuantityConstant.STATUS_LOCATION_LOCK)) {
+            return Result.error("指定库位失败，库位" + toLocationCode + "已经锁定");
+        }
+        if (!receiptContainerHeaderService.updateToLocationById(toLocationCode, receiptContainerHeader.getId())) {
+            throw new JeecgBootException("指定库位失败, 更新组盘头失败");
+        }
+        Result result = receiptContainerHeaderService.createReceiptTask(receiptContainerHeader, warehouseCode);
+        return result;
+    }
+
+    @Override
     public boolean updateById(ReceiptContainerHeader receiptContainerHeader) {
         LambdaQueryWrapper<ReceiptContainerHeader> receiptContainerHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
         receiptContainerHeaderLambdaQueryWrapper.eq(ReceiptContainerHeader::getId, receiptContainerHeader.getId()).lt(receiptContainerHeader.getStatus() != null,
@@ -2005,14 +2005,6 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
             return Result.error("创建入库任务时， 容器已在库位" + container.getLocationCode() + "上");
         }
         if (StringUtils.isNotEmpty(toLocationCode)) {
-            String value = parameterConfigurationService.getValueByCode(QuantityConstant.RULE_ALLOCATION);
-            if (StringUtils.isEmpty(value)) {
-                return Result.error("创建入库任务时, 未绑定定位规则");
-            }
-            int allocationRule = Integer.parseInt(value);
-            if (allocationRule == QuantityConstant.DOUBLE_FORK) {
-                return Result.error("创建入库任务时, 双伸位库位不能手动指定库位");
-            }
             Location toLocation = locationService.getLocationByCode(toLocationCode, warehouseCode);
             if (toLocation == null) {
                 return Result.error("创建入库任务时，" + toLocationCode + "目标库位不存在");
@@ -2024,6 +2016,14 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
                 return Result.error("创建入库任务时， 目标库位非空闲");
             }
             zoneCode = toLocation.getZoneCode();
+            String value = parameterConfigurationService.getValueByZoneCode(QuantityConstant.RULE_ALLOCATION, zoneCode);
+            if (StringUtils.isEmpty(value)) {
+                return Result.error("创建入库任务时, 未绑定定位规则");
+            }
+            int allocationRule = Integer.parseInt(value);
+            if (allocationRule == QuantityConstant.DOUBLE_FORK) {
+                return Result.error("创建入库任务时, 双伸位库位不能手动指定库位");
+            }
         }
         taskLockEntity.setZoneCode(zoneCode);
         success = containerService.updateStatus(containerCode, QuantityConstant.STATUS_CONTAINER_LOCK, warehouseCode);