1.增加库别维护信息

2.每次只给客户端发送2个出库任务

src/main/java/com/neotel/smfcore/core/device/rest/DeviceController.java

@@ -27,7 +27,9 @@ import com.neotel.smfcore.core.system.service.po.DataLog;
 import com.neotel.smfcore.core.system.util.DevicesStatusUtil;
 import com.neotel.smfcore.core.system.util.DevicesStatusUtil;
 import com.neotel.smfcore.core.system.util.TaskService;
 import com.neotel.smfcore.core.system.util.TaskService;
 import com.neotel.smfcore.custom.lizhen.LizhenApi;
 import com.neotel.smfcore.custom.lizhen.LizhenApi;
+import com.neotel.smfcore.custom.lizhen.innerBox.bean.WareHouseCode;
 import com.neotel.smfcore.custom.lizhen.innerBox.enums.ExtendType;
 import com.neotel.smfcore.custom.lizhen.innerBox.enums.ExtendType;
+import com.neotel.smfcore.custom.lizhen.innerBox.service.manager.WareHouseCodeManager;
 import com.neotel.smfcore.custom.lizhen.virtual.service.manager.IVirInventoryManager;
 import com.neotel.smfcore.custom.lizhen.virtual.service.manager.IVirInventoryManager;
 import com.neotel.smfcore.custom.lizhen.wcs.bean.BackToWarehouse;
 import com.neotel.smfcore.custom.lizhen.wcs.bean.BackToWarehouse;
 import com.neotel.smfcore.security.annotation.AnonymousAccess;
 import com.neotel.smfcore.security.annotation.AnonymousAccess;
@@ -41,6 +43,8 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
@@ -80,6 +84,9 @@ public class DeviceController {
     @Autowired
     @Autowired
     private IVirInventoryManager virInventoryManager;
     private IVirInventoryManager virInventoryManager;
 
 
+    @Autowired
+    private WareHouseCodeManager wareHouseCodeManager;
+
     private Map<String, IDeviceHandler> handlerMap = new HashMap<>();
     private Map<String, IDeviceHandler> handlerMap = new HashMap<>();
 
 
     public DeviceController(List<IDeviceHandler> deviceHandlerList) {
     public DeviceController(List<IDeviceHandler> deviceHandlerList) {
@@ -199,6 +206,13 @@ public class DeviceController {
                     if (StringUtils.isEmpty(warehouseCode)){
                     if (StringUtils.isEmpty(warehouseCode)){
                         throw new ValidateException("", barcode.getBarcode()+"未找到对应的库别信息");
                         throw new ValidateException("", barcode.getBarcode()+"未找到对应的库别信息");
                     }
                     }
+
+                    //判断库别是否正确
+                    WareHouseCode wareHouseCode = wareHouseCodeManager.findOneByQuery(new Query(Criteria.where("wareHouseCode").is(warehouseCode)));
+                    if (wareHouseCode == null){
+                        throw new ValidateException("", barcode.getBarcode()+"对应的库别信息是:"+warehouseCode+",在库别维护中,不存在,请先维护");
+                    }
+
                     if (StringUtils.isNotEmpty(reelBarcode.getLabelId())) {
                     if (StringUtils.isNotEmpty(reelBarcode.getLabelId())) {
                         barcode.setLabelId(reelBarcode.getLabelId());
                         barcode.setLabelId(reelBarcode.getLabelId());
                     }
                     }

src/main/java/com/neotel/smfcore/core/system/util/TaskService.java

@@ -457,6 +457,13 @@ public class TaskService {
                     task.setUpdateDate(new Date());
                     task.setUpdateDate(new Date());
                     return task;
                     return task;
                 }
                 }
+                if (task.isCheckOutTask()) {
+                    checkoutSize++;
+                    if (checkoutSize >= 2) {
+                        //log.error("cid["+cid + "]的BOX["+ boxId+"]的出库任务已经超过2个,不再分配!");
+                        return null;
+                    }
+                }
             }
             }
         }
         }
 
 

src/main/java/com/neotel/smfcore/custom/lizhen/innerBox/bean/WareHouseCode.java

+package com.neotel.smfcore.custom.lizhen.innerBox.bean;
+
+import com.neotel.smfcore.common.base.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+@Setter
+@Getter
+public class WareHouseCode extends BasePo implements Serializable {
+
+    /**
+     * 厂区
+     */
+    private String plant;
+
+    /**
+     * 库别
+     */
+    private String wareHouseCode;
+
+    /**
+     * 描述
+     */
+    private String description;
+
+    /**
+     * 创建人
+     */
+    private String createBy;
+
+    /**
+     * 修改人
+     */
+    private String updateBy;
+}

src/main/java/com/neotel/smfcore/custom/lizhen/innerBox/bean/dto/WareHouseCodeDto.java

+package com.neotel.smfcore.custom.lizhen.innerBox.bean.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.io.Serializable;
+
+@Getter
+@Setter
+@ToString
+public class WareHouseCodeDto implements Serializable {
+
+    @ApiModelProperty("ID")
+    private String id;
+
+    @ApiModelProperty("厂别")
+    private String plant;
+
+    @ApiModelProperty("库别")
+    private String wareHouseCode;
+
+    @ApiModelProperty("描述")
+    private String description;
+}

src/main/java/com/neotel/smfcore/custom/lizhen/innerBox/bean/mapstruct/WareHouseCodeMapper.java

+package com.neotel.smfcore.custom.lizhen.innerBox.bean.mapstruct;
+
+import com.neotel.smfcore.common.base.BaseMapper;
+import com.neotel.smfcore.custom.lizhen.innerBox.bean.WareHouseCode;
+import com.neotel.smfcore.custom.lizhen.innerBox.bean.dto.WareHouseCodeDto;
+import org.mapstruct.Mapper;
+import org.mapstruct.ReportingPolicy;
+
+@Mapper(componentModel = "spring" ,unmappedTargetPolicy = ReportingPolicy.IGNORE)
+public interface WareHouseCodeMapper extends BaseMapper<WareHouseCodeDto, WareHouseCode> {
+
+}

src/main/java/com/neotel/smfcore/custom/lizhen/innerBox/bean/query/WareHouseCodeQueryCriteria.java

+package com.neotel.smfcore.custom.lizhen.innerBox.bean.query;
+
+import com.neotel.smfcore.common.annotation.QueryCondition;
+import lombok.Data;
+
+@Data
+public class WareHouseCodeQueryCriteria {
+    @QueryCondition(blurry = "plant,wareHouseCode,description,createBy,updateBy")
+    private String blurry;
+}

src/main/java/com/neotel/smfcore/custom/lizhen/innerBox/rest/CodeController.java

+package com.neotel.smfcore.custom.lizhen.innerBox.rest;
+
+import com.neotel.smfcore.common.bean.PageData;
+import com.neotel.smfcore.common.bean.ResultBean;
+import com.neotel.smfcore.common.utils.JsonUtil;
+import com.neotel.smfcore.common.utils.QueryHelp;
+import com.neotel.smfcore.common.utils.SecurityUtils;
+import com.neotel.smfcore.common.utils.StringUtils;
+import com.neotel.smfcore.core.order.service.manager.ILiteOrderItemManager;
+import com.neotel.smfcore.core.order.service.manager.ILiteOrderManager;
+import com.neotel.smfcore.core.order.service.po.LiteOrder;
+import com.neotel.smfcore.core.order.service.po.LiteOrderItem;
+import com.neotel.smfcore.custom.lizhen.innerBox.bean.WareHouseCode;
+import com.neotel.smfcore.custom.lizhen.innerBox.bean.dto.WareHouseCodeDto;
+import com.neotel.smfcore.custom.lizhen.innerBox.bean.mapstruct.WareHouseCodeMapper;
+import com.neotel.smfcore.custom.lizhen.innerBox.bean.query.WareHouseCodeQueryCriteria;
+import com.neotel.smfcore.custom.lizhen.innerBox.service.manager.WareHouseCodeManager;
+import com.neotel.smfcore.security.annotation.AnonymousAccess;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
+
+@ApiOperation("库别维护页面")
+@Slf4j
+@RestController
+@RequestMapping("/api/wareHouseCode")
+public class CodeController {
+
+    @Autowired
+    private WareHouseCodeManager codeManager;
+
+    @Autowired
+    private WareHouseCodeMapper codeMapper;
+
+    @Autowired
+    private ILiteOrderManager liteOrderManager;
+
+    @Autowired
+    private ILiteOrderItemManager liteOrderItemManager;
+    /*@ApiOperation("根据id查找库别信息")
+    @RequestMapping("/getById")
+    @AnonymousAccess
+    public ResultBean getWareHouseCodeById(String id) {
+        WareHouseCode wareHouseCode = codeManager.get(id);
+        return ResultBean.newOkResult(codeMapper.toDto(wareHouseCode));
+    }*/
+
+    @ApiOperation("保存库别信息")
+    @PostMapping
+    @AnonymousAccess
+    public ResultBean saveWareHouseCode(@RequestBody WareHouseCodeDto wareHouseCodeDto) {
+        WareHouseCode wareHouseCode = codeMapper.toEntity(wareHouseCodeDto);
+        wareHouseCode.setCreateBy(SecurityUtils.getCurrentUsername());
+        codeManager.save(wareHouseCode);
+        return ResultBean.newOkResult("");
+    }
+
+    @ApiOperation("修改库别信息")
+    @PutMapping
+    @AnonymousAccess
+    private ResultBean updateWareHouseCode(@RequestBody WareHouseCodeDto wareHouseCodeDto){
+        if (wareHouseCodeDto.getId() == null) {
+            return ResultBean.newErrorResult(-1,"smfcore.valueCanotNull","{0}不能为空",new String[]{"id"} );
+        }
+        WareHouseCode wareHouseCode = codeMapper.toEntity(wareHouseCodeDto);
+        wareHouseCode.setId(wareHouseCodeDto.getId());
+        wareHouseCode.setUpdateBy(SecurityUtils.getCurrentUsername());
+        wareHouseCode.setUpdateDate(new Date());
+        codeManager.save(wareHouseCode);
+        return ResultBean.newOkResult("");
+    }
+
+    @ApiOperation("删除库别信息")
+    @DeleteMapping
+    @AnonymousAccess
+    private ResultBean deleteWareHouseCodeById(@RequestBody Set<String> ids){
+        List<WareHouseCode> codes = new ArrayList<>();
+        for (String id : ids) {
+            if (id == null) {
+               return  ResultBean.newErrorResult(-1,"smfcore.valueCanotNull","{0}不能为空",new String[]{"ID"} );
+            }
+            WareHouseCode wareHouseCode = codeManager.get(id);
+            if (wareHouseCode == null){
+                return ResultBean.newErrorResult(-1,"smfcore.valueNotExist","{0}[{1}]不存在",new String[]{"id",id});
+            }
+            codes.add(wareHouseCode);
+        }
+        for (WareHouseCode code : codes) {
+            log.info(SecurityUtils.getCurrentUsername()+"删除的信息为:"+ JsonUtil.toJsonStr(code));
+            codeManager.delete(code);
+        }
+        return ResultBean.newOkResult("");
+    }
+
+    @ApiOperation("库别列表")
+    @GetMapping("/list")
+    @AnonymousAccess
+    private PageData getWareHouseCodeList(WareHouseCodeQueryCriteria criteria, Pageable pageable){
+        Query query = QueryHelp.getQuery(criteria);
+        PageData<WareHouseCode> codePageData = codeManager.findByPage(query, pageable);
+        List<WareHouseCodeDto> codeDtos = new ArrayList<>();
+        List<WareHouseCode> codes = codePageData.getContent();
+        for (WareHouseCode code : codes) {
+            WareHouseCodeDto codeDto = codeMapper.toDto(code);
+            codeDto.setId(code.getId());
+            codeDtos.add(codeDto);
+        }
+        return new PageData(codeDtos,codePageData.getTotalElements());
+    }
+
+    @ApiOperation("获取库别列表下拉")
+    @RequestMapping("/pullDown")
+    @AnonymousAccess
+    private List<String>  getWareHouseCodePullDown(String orderNo){
+        List<WareHouseCode> wareHouseCodes = codeManager.findAll();
+        List<String> pullDowns = new ArrayList<>();
+        List<String> warehouseCodes = new ArrayList<>();
+        if (StringUtils.isNotBlank(orderNo)){
+            LiteOrder liteOrder = liteOrderManager.findByOrderNo(orderNo);
+            if (liteOrder != null){
+                List<LiteOrderItem> orderItems = liteOrderItemManager.findOrderItems(liteOrder.getId());
+                for (LiteOrderItem orderItem : orderItems) {
+                    if (StringUtils.isNotBlank(orderItem.getWarehouseCode())){
+                        if (!warehouseCodes.contains(orderItem.getWarehouseCode())) {
+                            warehouseCodes.add(orderItem.getWarehouseCode());
+                        }
+                    }
+                }
+            }
+        }
+        for (WareHouseCode wareHouseCode : wareHouseCodes) {
+            String code = wareHouseCode.getWareHouseCode();
+            if (warehouseCodes != null && !warehouseCodes.isEmpty()){
+                if (warehouseCodes.contains(code)) {
+                    pullDowns.add(code);
+                }
+            } else {
+                pullDowns.add(code);
+            }
+        }
+        return pullDowns;
+    }
+}

src/main/java/com/neotel/smfcore/custom/lizhen/innerBox/service/dao/WareHouseCodeDao.java

+package com.neotel.smfcore.custom.lizhen.innerBox.service.dao;
+
+import com.neotel.smfcore.common.base.IBaseDao;
+
+public interface WareHouseCodeDao extends IBaseDao {
+}

src/main/java/com/neotel/smfcore/custom/lizhen/innerBox/service/dao/impl/WareHouseCodeDaoImpl.java

+package com.neotel.smfcore.custom.lizhen.innerBox.service.dao.impl;
+
+import com.neotel.smfcore.common.base.AbstractBaseDao;
+import com.neotel.smfcore.custom.lizhen.innerBox.bean.WareHouseCode;
+import com.neotel.smfcore.custom.lizhen.innerBox.service.dao.WareHouseCodeDao;
+import org.springframework.stereotype.Service;
+
+@Service
+public class WareHouseCodeDaoImpl extends AbstractBaseDao implements WareHouseCodeDao {
+    @Override
+    public Class getEntityClass() {
+        return WareHouseCode.class;
+    }
+}

src/main/java/com/neotel/smfcore/custom/lizhen/innerBox/service/manager/WareHouseCodeManager.java

+package com.neotel.smfcore.custom.lizhen.innerBox.service.manager;
+
+import com.neotel.smfcore.common.base.IBaseManager;
+import com.neotel.smfcore.custom.lizhen.innerBox.bean.WareHouseCode;
+import org.springframework.data.mongodb.core.query.Query;
+
+import java.util.List;
+
+public interface WareHouseCodeManager extends IBaseManager<WareHouseCode> {
+    List<WareHouseCode> findAll();
+
+    WareHouseCode findOneByQuery(Query query);
+}

src/main/java/com/neotel/smfcore/custom/lizhen/innerBox/service/manager/impl/WareHouseCodeManagerImpl.java

+package com.neotel.smfcore.custom.lizhen.innerBox.service.manager.impl;
+
+import com.neotel.smfcore.common.bean.PageData;
+import com.neotel.smfcore.common.exception.ValidateException;
+import com.neotel.smfcore.custom.lizhen.innerBox.bean.WareHouseCode;
+import com.neotel.smfcore.custom.lizhen.innerBox.service.dao.WareHouseCodeDao;
+import com.neotel.smfcore.custom.lizhen.innerBox.service.manager.WareHouseCodeManager;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class WareHouseCodeManagerImpl implements WareHouseCodeManager {
+
+    @Autowired
+    private WareHouseCodeDao codeDao;
+
+
+    @Override
+    public WareHouseCode get(String id) {
+        return codeDao.findOneById(id);
+    }
+
+    @Override
+    public WareHouseCode save(WareHouseCode object) throws ValidateException {
+        return codeDao.save(object);
+    }
+
+    @Override
+    public void delete(WareHouseCode object) throws ValidateException {
+        codeDao.removeOne(object);
+    }
+
+    @Override
+    public PageData<WareHouseCode> findByPage(Query query, Pageable pageable) {
+        int totalCount = codeDao.countByQuery(query);
+        List<WareHouseCode> wareHouseCodes= codeDao.findByQuery(query,pageable);
+        return new PageData(wareHouseCodes,totalCount);
+    }
+
+    @Override
+    public List<WareHouseCode> findByQuery(Query query) {
+        return null;
+    }
+
+    @Override
+    public List<WareHouseCode> findAll() {
+        return codeDao.findAll();
+    }
+
+    @Override
+    public WareHouseCode findOneByQuery(Query query) {
+        return codeDao.findOne(query);
+    }
+}