增加容器在库内还是库外的查询

肖超群
1 parent 5a3ed610
Showing 4 changed files with 50 additions and 0 deletions
ant-design-vue-jeecg/src/views/system/config/ContainerList.vue
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/container/controller/ContainerController.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/container/entity/Container.java
huaheng-wms-core/src/main/java/org/jeecg/utils/constant/QuantityConstant.java
@@ -46,6 +46,12 @@
                 />
               </a-form-item>
             </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="位置">
+                <j-dict-select-tag placeholder="请选择位置" v-model="queryParam.inLocation"
+                                   dictCode="inLocation"/>
+              </a-form-item>
+            </a-col>
           </template>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
@@ -255,6 +261,11 @@ export default {
           scopedSlots: {customRender: 'fillStatus_dictText'}
         },
         {
+          title: '位置',
+          align: 'center',
+          dataIndex: 'inLocation_dictText',
+        },
+        {
           title: '任务总数',
           align: "center",
           dataIndex: 'taskTimes',
@@ -358,6 +369,7 @@ export default {
       fieldList.push({type: 'string', value: 'containerTypeCode', text: '容器类型', dictCode: ''})
       fieldList.push({type: 'string', value: 'status', text: '容器状态', dictCode: 'container_status'})
       fieldList.push({type: 'string', value: 'fillStatus', text: '容器填充状态', dictCode: 'fill_status'})
+      fieldList.push({type: 'string', value: 'inLocation', text: '容器填充状态', dictCode: 'inLocation'})
       fieldList.push({type: 'string', value: 'createBy', text: '创建人', dictCode: ''})
       fieldList.push({type: 'datetime', value: 'createTime', text: '创建日期'})
       fieldList.push({type: 'string', value: 'updateBy', text: '更新人', dictCode: ''})
@@ -19,6 +19,7 @@ import org.jeecg.modules.wms.config.location.entity.Location;
 import org.jeecg.modules.wms.config.location.service.ILocationService;
 import org.jeecg.utils.HuahengJwtUtil;
 import org.jeecg.utils.StringUtils;
+import org.jeecg.utils.constant.QuantityConstant;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
@@ -62,8 +63,17 @@ public class ContainerController extends JeecgController&lt;Container, IContainerSe
     public Result<IPage<Container>> queryPageList(Container container, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
         @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
         HuahengJwtUtil.setWarehouseCode(req, container);
+        Integer inLocation = container.haveInLocation();
+        container.setInLocation(null);
         QueryWrapper<Container> queryWrapper = QueryGenerator.initQueryWrapper(container, null);
         LambdaQueryWrapper<Container> containerLambdaQueryWrapper = queryWrapper.lambda();
+        if (inLocation != null) {
+            if (inLocation == QuantityConstant.STATUS_LOCATION_OUT) {
+                containerLambdaQueryWrapper.eq(Container::getLocationCode, QuantityConstant.EMPTY_STRING);
+            } else if (inLocation == QuantityConstant.STATUS_LOCATION_IN) {
+                containerLambdaQueryWrapper.ne(Container::getLocationCode, QuantityConstant.EMPTY_STRING);
+            }
+        }
         containerLambdaQueryWrapper.orderByAsc(Container::getId);
         Page<Container> page = new Page<Container>(pageNo, pageSize);
         IPage<Container> pageList = containerService.page(page, containerLambdaQueryWrapper);
@@ -4,9 +4,12 @@ import java.io.Serializable;
 import java.util.Date;
  
 import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecg.utils.StringUtils;
+import org.jeecg.utils.constant.QuantityConstant;
 import org.jeecgframework.poi.excel.annotation.Excel;
  
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
  
@@ -71,6 +74,10 @@ public class Container implements Serializable {
     private Integer taskTimes;
     @ApiModelProperty(value = "移库任务数")
     private Integer moveTaskTimes;
+    @ApiModelProperty(value = "位置")
+    @TableField(exist = false)
+    @Dict(dicCode = "inLocation")
+    private Integer inLocation;
     /** 备用字段1 */
     @ApiModelProperty(value = "备用字段1")
     private String userdef1;
@@ -92,4 +99,20 @@ public class Container implements Serializable {
     /** 更新日期 */
     @ApiModelProperty(value = "更新日期")
     private Date updateTime;
+
+    public Integer getInLocation() {
+        if (StringUtils.isNotEmpty(locationCode)) {
+            return QuantityConstant.STATUS_LOCATION_IN;
+        } else {
+            return QuantityConstant.STATUS_LOCATION_OUT;
+        }
+    }
+
+    public void setInLocation(Integer inLocation) {
+        this.inLocation = inLocation;
+    }
+
+    public Integer haveInLocation() {
+        return this.inLocation;
+    }
 }
@@ -593,6 +593,11 @@ public class QuantityConstant {
     /* 不可用 */
     public static final int STATUS_DISABLE = 0;
  
+    /* 在库外 */
+    public static final int STATUS_LOCATION_OUT = 0;
+    /* 在库内 */
+    public static final int STATUS_LOCATION_IN = 1;
+
     /* 可用 */
     public static final int INVENTORY_DETAIL_STATUS_ENABLE = 0;
     /* 受控 */