Merge branch 'develop4' of http://172.16.29.40:8010/wms/wms4.git into develop4

谭毅彬
2 parents 8c45b8f7 d4f58fa0
Showing 8 changed files with 102 additions and 50 deletions
ant-design-vue-jeecg/src/views/system/config/AddressList.vue
ant-design-vue-jeecg/src/views/system/config/modules/AddressForm.vue
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/address/entity/Address.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/container/service/IContainerService.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/container/service/impl/ContainerServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/service/ILocationService.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/service/impl/LocationServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
@@ -148,7 +148,7 @@ export default {
         {
           title: '编码',
           align: "center",
-          dataIndex: 'code'
+          dataIndex: 'param'
         },
         {
           title: '库区',
@@ -161,6 +161,11 @@ export default {
           dataIndex: 'url'
         },
         {
+          title: '备注',
+          align: "center",
+          dataIndex: 'remark'
+        },
+        {
           title: '创建人',
           align: "center",
           dataIndex: 'createBy'
@@ -5,7 +5,7 @@
         <a-row>
           <a-col :span="24">
             <a-form-model-item label="编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="code">
-              <a-input v-model="model.code" placeholder="请输入编码"></a-input>
+              <a-input v-model="model.param" placeholder="请输入编码"></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -18,6 +18,11 @@
               <a-input v-model="model.url" placeholder="请输入接口地址"></a-input>
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remark">
+              <a-input v-model="model.remark" placeholder="请输入备注"></a-input>
+            </a-form-model-item>
+          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>
 package org.jeecg.modules.wms.config.address.entity;
  
 import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
 import java.util.Date;
-import java.math.BigDecimal;
+
+import org.jeecgframework.poi.excel.annotation.Excel;
+
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecg.common.aspect.annotation.Dict;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
  
@@ -51,6 +49,10 @@ public class Address implements Serializable {
     @Excel(name = "接口地址", width = 15)
     @ApiModelProperty(value = "接口地址")
     private String url;
+    /** 备注 */
+    @Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private String remark;
     /** 备用字段1 */
     @Excel(name = "备用字段1", width = 15)
     @ApiModelProperty(value = "备用字段1")
 package org.jeecg.modules.wms.config.container.service;
  
-import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.wms.config.container.entity.Container;
  
-import java.util.List;
+import com.baomidou.mybatisplus.extension.service.IService;
  
 /**
  * @Description: 容器管理
@@ -26,4 +27,9 @@ public interface IContainerService extends IService&lt;Container&gt; {
     Container createLSContainer(String warehouseCode);
  
     List<Container> getContainerListByStatus(String status, String warehouseCode);
+
+    /**
+     * 判断系统是否已经有同样的库位号，如果有证明数据混乱了
+     */
+    boolean havaLocationCodeByContainer(String locationCode, String warehouseCode);
 }
 package org.jeecg.modules.wms.config.container.service.impl;
  
-import com.aliyun.oss.ServiceException;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
-import com.baomidou.mybatisplus.extension.conditions.query.QueryChainWrapper;
-import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
-import com.baomidou.mybatisplus.extension.conditions.update.UpdateChainWrapper;
-import com.baomidou.mybatisplus.extension.kotlin.KtQueryChainWrapper;
-import com.baomidou.mybatisplus.extension.kotlin.KtUpdateChainWrapper;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.List;
+
+import javax.annotation.Resource;
+
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.wms.config.container.entity.Container;
 import org.jeecg.modules.wms.config.container.mapper.ContainerMapper;
@@ -19,14 +15,11 @@ import org.jeecg.modules.wms.config.containerType.service.IContainerTypeService;
 import org.jeecg.utils.constant.QuantityConstant;
 import org.springframework.stereotype.Service;
  
+import com.aliyun.oss.ServiceException;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  
-import javax.annotation.Resource;
-import java.io.Serializable;
-import java.text.MessageFormat;
-import java.util.*;
-import java.util.function.Function;
-
 /**
  * @Description: 容器管理
  * @Author:      jeecg-boot
@@ -89,10 +82,14 @@ public class ContainerServiceImpl extends ServiceImpl&lt;ContainerMapper, Container
         if (container == null) {
             return false;
         }
+        boolean success = havaLocationCodeByContainer(locationCode, warehouseCode);
+        if (!success) {
+            throw new ServiceException("取消任务时, 库位表已经存在这个容器号,不能再写入");
+        }
         container.setStatus(status);
         container.setLocationCode(locationCode);
-        boolean result = updateById(container);
-        return result;
+        success = updateById(container);
+        return success;
     }
  
     @Override
@@ -116,6 +113,17 @@ public class ContainerServiceImpl extends ServiceImpl&lt;ContainerMapper, Container
         return containerList;
     }
  
+    @Override
+    public boolean havaLocationCodeByContainer(String locationCode, String warehouseCode) {
+        LambdaQueryWrapper<Container> containerLambdaQueryWrapper = Wrappers.lambdaQuery();
+        containerLambdaQueryWrapper.eq(Container::getLocationCode, locationCode).eq(Container::getWarehouseCode, warehouseCode);
+        Container container = getOne(containerLambdaQueryWrapper);
+        if (container == null) {
+            return false;
+        }
+        return true;
+    }
+
     private int getStartNumber(String containerTypeCode, String warehouseCode) {
         LambdaQueryWrapper<Container> containerLambdaQueryWrapper = Wrappers.lambdaQuery();
         containerLambdaQueryWrapper.eq(Container::getContainerTypeCode, containerTypeCode).eq(Container::getWarehouseCode, warehouseCode)
 package org.jeecg.modules.wms.config.location.service;
  
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.wms.config.location.entity.BatchLocation;
 import org.jeecg.modules.wms.config.location.entity.Location;
 import org.jeecg.modules.wms.config.location.entity.LocationInfo;
  
-import java.util.List;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
  
 /**
  * @Description: 库位管理
@@ -45,4 +46,9 @@ public interface ILocationService extends IService&lt;Location&gt; {
     LocationInfo getAllLocation(String type);
  
     IPage<Location> listEmptyContainerInLocation(Page<Location> page, Location location);
+
+    /**
+     * 判断系统是否已经有同样的托盘号，如果有证明数据混乱了
+     */
+    boolean havaContainerCodeInLocation(String containerCode, String warehouseCode);
 }
 package org.jeecg.modules.wms.config.location.service.impl;
  
-import com.aliyun.oss.ServiceException;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.apache.ibatis.annotations.Param;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+import javax.annotation.Resource;
+
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.wms.config.location.entity.BatchLocation;
 import org.jeecg.modules.wms.config.location.entity.Location;
@@ -20,16 +22,14 @@ import org.jeecg.modules.wms.task.taskHeader.service.ITaskHeaderService;
 import org.jeecg.utils.StringUtils;
 import org.jeecg.utils.constant.QuantityConstant;
 import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.transaction.annotation.Transactional;
  
-import javax.annotation.Resource;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
+import com.aliyun.oss.ServiceException;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  
 /**
  * @Description: 库位管理
@@ -84,10 +84,15 @@ public class LocationServiceImpl extends ServiceImpl&lt;LocationMapper, Location&gt; i
         if (location == null) {
             return false;
         }
+        // 如果这个托盘号已经在库位表里，那么不能再写入
+        boolean success = havaContainerCodeInLocation(containerCode, warehouseCode);
+        if (success) {
+            throw new ServiceException("库位表已经存在这个容器号，不能再写入");
+        }
         location.setContainerCode(containerCode);
         location.setStatus(status);
-        boolean result = updateById(location);
-        return result;
+        success = updateById(location);
+        return success;
     }
  
     @Override
@@ -335,6 +340,17 @@ public class LocationServiceImpl extends ServiceImpl&lt;LocationMapper, Location&gt; i
     }
  
     @Override
+    public boolean havaContainerCodeInLocation(String containerCode, String warehouseCode) {
+        LambdaQueryWrapper<Location> locationLambdaQueryWrapper = Wrappers.lambdaQuery();
+        locationLambdaQueryWrapper.eq(Location::getContainerCode, containerCode).eq(Location::getWarehouseCode, warehouseCode);
+        Location location = getOne(locationLambdaQueryWrapper);
+        if (location == null) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
     public IPage<Location> listEmptyContainerInLocation(Page page, Location location) {
         return locationMapper.listEmptyContainerInLocation(page, location);
     }
@@ -1805,6 +1805,10 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
         if (StringUtils.isNotEmpty(lastStatus)) {
             container.setStatus(lastStatus); // 解决空托盘组移库问题
         }
+        success = containerService.havaLocationCodeByContainer(fromLocationCode, warehouseCode);
+        if (!success) {
+            throw new ServiceException("取消任务时, 库位表已经存在这个容器号,不能再写入");
+        }
         container.setLastStatus(QuantityConstant.EMPTY_STRING);
         container.setLocationCode(fromLocationCode);
         success = containerService.updateById(container);