质检、理货备货bug修复

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/pda/PdaController.java

@@ -1,6 +1,6 @@
 package com.ruoyi.web.controller.warewms.pda;
 
-import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.ruoyi.ams.asn.domain.WmsDocAsnDetails;
@@ -14,6 +14,7 @@ import com.ruoyi.ams.asn.service.IWmsDocAsnDetailsService;
 import com.ruoyi.ams.asn.service.IWmsDocAsnHeaderService;
 import com.ruoyi.ams.asn.vo.SearchStockVO;
 import com.ruoyi.ams.box.domain.WmsBoxInfo;
+import com.ruoyi.ams.box.domain.WmsBoxReqDTO;
 import com.ruoyi.ams.box.form.AddBoxForm;
 import com.ruoyi.ams.box.form.UpdateBoxForm;
 import com.ruoyi.ams.box.service.IWmsBoxInfoService;
@@ -58,16 +59,20 @@ import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.service.ISysConfigService;
 import com.ruoyi.system.service.ISysDictDataService;
+import io.jsonwebtoken.lang.Assert;
 import lombok.extern.slf4j.Slf4j;
+import org.assertj.core.util.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * Created by IntelliJ IDEA.
@@ -867,13 +872,14 @@ public class PdaController {
      * 根据库位获取托盘信息
      */
     @PostMapping("/boxInfo/queryBoxInfo")
-    public AjaxResult queryBoxInfo(@RequestBody WmsBoxInfo wmsBoxInfo) {
-        wmsBoxInfo.setLocationId(Constant.LOC_SORTATION_CACHE);
-        WmsBoxInfo boxInfo = wmsBoxInfoService.selectWmsBoxInfoByModel(wmsBoxInfo);
-        if (ObjectUtil.isNull(boxInfo) || StringUtils.isBlank(boxInfo.getBoxNo())) {
-            return AjaxResult.error(wmsBoxInfo.getLocationId()+"库位不存在存在该托盘");
-        }
-        return AjaxResult.success(wmsBoxInfo.getLocationId()+"库位存在存在该托盘");
+    public AjaxResult queryBoxInfo(@RequestBody @Valid WmsBoxReqDTO wmsBoxReqDTO) {
+        List<Long> sortLocationList = Lists.newArrayList(Constant.LOC_SORTATION_CACHE, Constant.LOC_SORTATION02_CACHE);
+        if (StringUtils.isBlank(wmsBoxReqDTO.getFlag()))
+            sortLocationList.addAll(Lists.newArrayList(Constant.LOC_STAGE_CACHE, Constant.LOC_MIDDLE_CACHE));
+        List<WmsBoxInfo> wmsBoxInfoList = wmsBoxInfoService.queryWmsBoxInfoByLocationIdList(sortLocationList);
+        List<WmsBoxInfo> boxInfoFilterList = wmsBoxInfoList.stream().filter(item -> wmsBoxReqDTO.getBoxNo().equals(item.getBoxNo())).collect(Collectors.toList());
+        Assert.isTrue(CollectionUtil.isNotEmpty(boxInfoFilterList), StringUtils.isBlank(wmsBoxReqDTO.getFlag()) ? "只能在虚拟区进行操作！" : "不在分拣区的托盘不可扫描");
+        return AjaxResult.success();
     }
 
     /**

ruoyi-framework/src/main/java/com/ruoyi/framework/mybatis/MybatisPlusMetaObjectHandler.java

@@ -1,8 +1,6 @@
 package com.ruoyi.framework.mybatis;
 
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
-import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.utils.SecurityUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.ibatis.reflection.MetaObject;
 import org.springframework.context.annotation.Configuration;
@@ -21,8 +19,6 @@ public class MybatisPlusMetaObjectHandler implements MetaObjectHandler {
     @Override
     public void insertFill(MetaObject metaObject) {
         this.setFieldValByName("createTime", new Date(), metaObject);
-        LoginUser loginUser = SecurityUtils.getLoginUser();
-        this.setFieldValByName("createBy", loginUser.getUsername(), metaObject);
 
     }
 
@@ -34,8 +30,6 @@ public class MybatisPlusMetaObjectHandler implements MetaObjectHandler {
     @Override
     public void updateFill(MetaObject metaObject) {
         this.setFieldValByName("updateTime", new Date(), metaObject);
-        LoginUser loginUser = SecurityUtils.getLoginUser();
-        this.setFieldValByName("updateBy", loginUser.getUsername(), metaObject);
     }
 
 }

warewms-ams/src/main/java/com/ruoyi/ams/box/domain/WmsBoxReqDTO.java

@@ -0,0 +1,20 @@
+package com.ruoyi.ams.box.domain;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+@Data
+public class WmsBoxReqDTO implements Serializable
+{
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("托盘")
+    @NotBlank(message = "托盘不能为空！")
+    private String boxNo;
+
+    @ApiModelProperty("调取标记 Y为理货备货 不传则为其他功能验证")
+    private String flag;
+}

warewms-ams/src/main/java/com/ruoyi/ams/box/service/IWmsBoxInfoService.java

@@ -136,6 +136,8 @@ public interface IWmsBoxInfoService {
      */
     List<WmsBoxInfo> queryWmsBoxInfoByPalletNoList(List<String> palletList);
 
+    List<WmsBoxInfo> queryWmsBoxInfoByLocationIdList(List<Long> locationIdList);
+
     /**
      * 修改托盘区域信息
      * @param boxNo

warewms-ams/src/main/java/com/ruoyi/ams/box/service/impl/WmsBoxInfoServiceImpl.java

@@ -248,6 +248,17 @@ public class WmsBoxInfoServiceImpl implements IWmsBoxInfoService {
                 .in(WmsBoxInfo::getBoxNo, palletList));
     }
 
+    /**
+     * 根据托盘号获取详细信息
+     * @param locationIdList
+     * @return
+     */
+    @Override
+    public List<WmsBoxInfo> queryWmsBoxInfoByLocationIdList(List<Long> locationIdList){
+        return wmsBoxInfoMapper.selectList(Wrappers.<WmsBoxInfo>lambdaQuery()
+                .in(WmsBoxInfo::getLocationId, locationIdList));
+    }
+
     /**
      * 修改托盘区域信息
      * @param boxNo

warewms-ams/src/main/java/com/ruoyi/ams/inv/service/impl/InvLotLocIdServiceImpl.java

@@ -33,8 +33,12 @@ import com.ruoyi.ams.task.domain.WcsTask;
 import com.ruoyi.base.constant.Constant;
 import com.ruoyi.base.domain.BaseLocationInfo;
 import com.ruoyi.base.domain.BaseLocationZone;
+import com.ruoyi.base.domain.BaseSku;
+import com.ruoyi.base.domain.BaseSkuType;
 import com.ruoyi.base.domain.form.BasLocationForm;
 import com.ruoyi.base.service.IBaseLocationInfoService;
+import com.ruoyi.base.service.IBaseSkuService;
+import com.ruoyi.base.service.IBaseSkuTypeService;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.exception.ServiceException;
@@ -84,6 +88,12 @@ public class InvLotLocIdServiceImpl extends CrudServiceImpl<InvLotLocIdMapper, I
     @Autowired
     private IWmsDocOrderHeaderService wmsDocOrderHeaderService;
 
+    @Autowired
+    private IBaseSkuService baseSkuService;
+
+    @Autowired
+    private IBaseSkuTypeService baseSkuTypeService;
+
     /**
      * 查询库位库存信息
      *
@@ -136,7 +146,23 @@ public class InvLotLocIdServiceImpl extends CrudServiceImpl<InvLotLocIdMapper, I
 
     @Override
     public List<InvLotLocIdLotattVO> selectInvLocIdLotattList(InvLocIdSearchFrom invLocIdSearchFrom) {
-        return invLotLocIdMapper.selectInvLocIdLotattList(invLocIdSearchFrom);
+        List<InvLotLocIdLotattVO> invLotLocIdLotAttVOList = invLotLocIdMapper.selectInvLocIdLotattList(invLocIdSearchFrom);
+        if (CollectionUtil.isEmpty(invLotLocIdLotAttVOList)) return invLotLocIdLotAttVOList;
+        List<BaseSku> baseSkuList = baseSkuService.queryActiveSkuList(invLotLocIdLotAttVOList.stream().map(InvLotLocIdLotattVO::getSku).collect(Collectors.toList()));
+        Map<String, List<BaseSku>> skuMap = baseSkuList.stream().collect(Collectors.groupingBy(BaseSku::getSku));
+        List<Long> skuTypeList = baseSkuList.stream().filter(item ->
+                StringUtils.isNotBlank(item.getSkuType())).map(BaseSku::getSkuType).map(Long::parseLong).distinct().collect(Collectors.toList());
+        List<BaseSkuType> baseSkuTypeList = baseSkuTypeService.queryBaseSkuTypeList(skuTypeList);
+        if (CollectionUtil.isEmpty(baseSkuTypeList)) return invLotLocIdLotAttVOList;
+        Map<Long, String> skuTypeMap = baseSkuTypeList.stream().collect(Collectors.toMap(BaseSkuType::getItemCode, BaseSkuType::getItemName));
+        invLotLocIdLotAttVOList.forEach(item -> {
+            BaseSku baseSku = skuMap.get(item.getSku()).stream().findFirst().orElseGet(() -> null);
+            Boolean flag = ObjectUtil.isNotNull(baseSku);
+            item.setSkuName(flag ? baseSku.getDesc1() : null);
+            item.setSkuModel(flag ? baseSku.getModel() : null);
+            item.setSkuTypeName(flag ? skuTypeMap.get(Long.parseLong(baseSku.getSkuType())) : null);
+        });
+        return invLotLocIdLotAttVOList;
     }
 
     /**

warewms-ams/src/main/java/com/ruoyi/ams/order/service/impl/WmsDocOrderHeaderServiceImpl.java

@@ -3206,18 +3206,26 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
      * 托盘出库：库位库存相关业务
      */
     private String invLotLocGroupDisk(GroupDiskConvertDTO groupDiskConvertDTO){
-        List<InvLotAtt> invLotAttList = invLotAttService.queryInvLotAtt(groupDiskConvertDTO.getPalletFrom(), groupDiskConvertDTO.getSn());
+        String sn = groupDiskConvertDTO.getSn();
+        List<InvLotAtt> invLotAttList = invLotAttService.queryInvLotAtt(groupDiskConvertDTO.getPalletFrom(), sn);
+        String orderNo = null;
+        if (StringUtils.isNotBlank(groupDiskConvertDTO.getWmsOrderNo())){
+            orderNo = groupDiskConvertDTO.getWmsOrderNo();
+            List<InvLotAtt> invLotAttFilterList = invLotAttList.stream().filter(item -> StringUtils.isNotBlank(item.getLotatt14()) &&
+                    StringUtils.equals(item.getLotatt14(), groupDiskConvertDTO.getWmsOrderNo())).collect(Collectors.toList());
+            Assert.isTrue(CollectionUtil.isEmpty(invLotAttFilterList), "该条码已备货！");
+        }
         List<InvLotLocId> invLotLocIdList = invLotLocIdService.queryInvLotLocIdByLotnum(invLotAttList.stream().map(InvLotAtt::getLotnum).collect(Collectors.toList()));
-        String orderNo = StringUtils.isNotBlank(groupDiskConvertDTO.getWmsOrderNo()) ? groupDiskConvertDTO.getWmsOrderNo() : null;
         //创建新批次
         InvLotLocId invLotLocId = invLotLocIdList.stream().findFirst().orElseThrow(() -> new BaseException("库位库存信息丢失！"));
         BigDecimal qtyAllocated = ObjectUtil.isNotNull(invLotLocId.getQtyallocated()) ? invLotLocId.getQtyallocated() : BigDecimal.ZERO;
         BigDecimal invLotLocQty = invLotLocId.getQty().subtract(qtyAllocated);
-        String asnNo = invLotAttList.stream().filter(item -> item.getLotnum().equals(invLotLocId.getLotnum())).map(InvLotAtt::getLotatt08).findFirst().orElseThrow(() -> new BaseException("此批次入库信息丢失！"));
+        String asnNo = invLotAttList.stream().filter(item -> item.getLotnum().equals(invLotLocId.getLotnum())).
+                map(InvLotAtt::getLotatt08).findFirst().orElseThrow(() -> new BaseException("此批次入库信息丢失！"));
         String sku = groupDiskConvertDTO.getSku();
-        invLotAttService.insertInvLotAtt(buildInvLotAtt(groupDiskConvertDTO.getLotNum(), groupDiskConvertDTO.getPalletTo(), orderNo, groupDiskConvertDTO.getSn(), sku, asnNo));
+        invLotAttService.insertInvLotAtt(buildInvLotAtt(groupDiskConvertDTO.getLotNum(), groupDiskConvertDTO.getPalletTo(), orderNo, sn, sku, asnNo));
         //验证托盘相关信息并获取指向托盘库位信息
-        String locationId = verifyInvLotAndGetLocationId(groupDiskConvertDTO.getPalletTo(), groupDiskConvertDTO.getSn(), orderNo);
+        String locationId = verifyInvLotAndGetLocationId(groupDiskConvertDTO.getPalletTo(), sn, orderNo);
         locationId = StringUtils.isNotBlank(locationId) ? locationId : invLotLocId.getLocationId();
         if (CompareUtil.compare(groupDiskConvertDTO.getGroupDiskQty(), invLotLocQty) >= 0) {
             invLotLocIdService.updateInvLotLocId(invLotLocId.getLotnum(), groupDiskConvertDTO.getLotNum(),
@@ -3288,7 +3296,7 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
         List<InvLotAtt> palletNoToInvLotAttList = invLotAttService.queryInvLotAtt(palletNoTo);
         if (CollectionUtil.isEmpty(palletNoToInvLotAttList)) return null;
         if (StringUtils.isNotBlank(sn) && CollectionUtil.isNotEmpty(palletNoToInvLotAttList.stream()
-                .filter(item -> StringUtils.isBlank(item.getLotatt08()) && item.getLotatt02().equals(sn)).collect(Collectors.toList()))) {
+                .filter(item -> item.getLotatt02().equals(sn)).collect(Collectors.toList()))) {
             throw new BaseException("该条码已生成批次");
         }
         //验证是否已经有不同出库单备货了

warewms-ams/src/main/java/com/ruoyi/ams/quality/dto/QualityInspectionDTO.java

@@ -0,0 +1,54 @@
+package com.ruoyi.ams.quality.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+
+/**
+ * 托盘匹配记录对象 pallet_match_log
+ * 
+ * @author ruoyi
+ * @date 2023-08-23
+ */
+@Data
+public class QualityInspectionDTO extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    @TableId(type = IdType.ASSIGN_UUID)
+    private String id;
+
+    /** 盘点单号 */
+    @Excel(name = "盘点单号")
+    private String stockNo;
+
+    /** 条形码 */
+    @Excel(name = "条形码")
+    private String barCode;
+
+    /** 扫描托盘 */
+    @Excel(name = "扫描托盘")
+    private String scanPallet;
+
+    /** 盘点托盘（实际栈板） */
+    @Excel(name = "盘点托盘（实际栈板）")
+    private String stockPallet;
+
+    /** 来源托盘（账面栈板） */
+    @Excel(name = "来源托盘（账面栈板）")
+    private String sourcePallet;
+
+    /** 盘点状态 1：已完成 2：未完成 */
+    @Excel(name = "盘点状态")
+    private String stockStatus;
+
+    /** 盘点类型 1：盘亏 2：盘盈*/
+    private String stockType;
+
+    /** 取消盘点标志 Y/N*/
+    private String delFlag;
+
+}

warewms-ams/src/main/java/com/ruoyi/ams/quality/service/QualityInspectionService.java

@@ -0,0 +1,13 @@
+package com.ruoyi.ams.quality.service;
+
+/**
+ * 托盘匹配记录Service接口
+ * 
+ * @author ruoyi
+ * @date 2023-08-23
+ */
+public interface QualityInspectionService
+{
+
+
+}

warewms-ams/src/main/java/com/ruoyi/ams/quality/service/impl/QualityInspectionServiceImpl.java

@@ -0,0 +1,39 @@
+package com.ruoyi.ams.quality.service.impl;
+
+import com.ruoyi.ams.quality.service.QualityInspectionService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 托盘匹配记录Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2023-08-23
+ */
+@Service
+public class QualityInspectionServiceImpl implements QualityInspectionService {
+
+
+//    /**
+//     * 盘点出库
+//     *
+//     * @param palletNoList
+//     */
+//    @Override
+//    @Transactional(rollbackFor = Exception.class)
+//    public void palletOutOfWarehouse(List<String> palletNoList) {
+//        Assert.isTrue(CollectionUtil.isNotEmpty(palletNoList), "托盘号不能为空！");
+//        List<WmsBoxInfo> wmsBoxInfoList = wmsBoxInfoService.queryWmsBoxInfoByPalletNoList(palletNoList);
+//        List<CheckOutInfoForm> checkOutInfoFormList = wmsBoxInfoList.stream().filter(item ->
+//                        //过滤掉托盘号、库位信息丢失托盘信息
+//                        StringUtils.isNotBlank(item.getBoxNo()) && ObjectUtil.isNotNull(item.getLocationId()))
+//                .map(item -> {
+//                    CheckOutInfoForm checkOutInfoForm = ConvertUtils.sourceToTarget(item, CheckOutInfoForm.class);
+//                    checkOutInfoForm.setPalletNo(item.getBoxNo());
+//                    checkOutInfoForm.setLocationNo(item.getLocationId().toString());
+//                    return checkOutInfoForm;
+//                }).collect(Collectors.toList());
+//        Assert.isTrue(CollectionUtil.isNotEmpty(checkOutInfoFormList), "托盘信息丢失！");
+//        //下发ams任务 物料拉动
+//        checkOutInfoFormList.forEach(item -> wmsDocOrderHeaderService.doCheckout(item));
+//    }
+}

warewms-ams/src/main/resources/mapper/ams/InvLotLocIdMapper.xml

@@ -374,8 +374,7 @@
 
     <select id="selectInvLocIdLotattList" resultMap="InvLotLocIdLotattResult">
         select
-        inv.location_id,sk.sku,sk.desc1 sku_name,sk.model sku_model,skt.item_name
-        sku_type_name,b.location_no,inv.qty,inv.qtyallocated
+        inv.location_id,b.location_no,inv.qty,inv.qtyallocated, inv.sku
         ,att.lotnum, att.customer_id,w.box_no,w.is_full
         ,b.zone_id,b.stock_status stockStatus,b.is_empty isEmpty,z.zone_name
         ,lotatt01, lotatt02, lotatt03, lotatt04,lot05_dict.dict_label lotatt05, supp.supplier_name lotatt06
@@ -385,8 +384,6 @@
         left join inv_lot_att att on inv.lotnum = att.lotnum
         left join base_location_info b on inv.location_id = b.id
         left join base_location_zone z on b.zone_id = z.zone_id
-        left join base_sku sk on inv.sku = sk.sku
-        left join base_sku_type skt on sk.sku_type = skt.item_code
         left join (select dict_label,dict_value from sys_dict_data where dict_type = 'ams_inv_quality') lot05_dict on
         att.lotatt05 = lot05_dict.dict_value
         left join (select * from base_supplier) supp on att.lotatt06 = supp.supplier_id

warewms-base/src/main/java/com/ruoyi/base/mapper/BaseSkuTypeMapper.java

@@ -1,16 +1,17 @@
 package com.ruoyi.base.mapper;
 
-import java.util.List;
-
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.base.domain.BaseSkuType;
 
+import java.util.List;
+
 /**
  * 物料分类Mapper接口
  *
  * @author andy
  * @date 2022-02-21
  */
-public interface BaseSkuTypeMapper {
+public interface BaseSkuTypeMapper extends BaseMapper<BaseSkuType> {
     /**
      * 查询物料分类
      *

warewms-base/src/main/java/com/ruoyi/base/service/IBaseSkuTypeService.java

@@ -1,9 +1,9 @@
 package com.ruoyi.base.service;
 
-import java.util.List;
-
 import com.ruoyi.base.domain.BaseSkuType;
 
+import java.util.List;
+
 /**
  * 物料分类Service接口
  *
@@ -62,4 +62,6 @@ public interface IBaseSkuTypeService {
     int saveOrUpdate(BaseSkuType baseSkuType);
 
     BaseSkuType selectBaseSkuTypeByRemark(String remark);
+
+    List<BaseSkuType> queryBaseSkuTypeList(List<Long> skuTypeCodeList);
 }

warewms-base/src/main/java/com/ruoyi/base/service/impl/BaseSkuTypeServiceImpl.java

@@ -1,15 +1,16 @@
 package com.ruoyi.base.service.impl;
 
-import java.util.List;
-
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.base.domain.BaseSkuType;
+import com.ruoyi.base.mapper.BaseSkuTypeMapper;
+import com.ruoyi.base.service.IBaseSkuTypeService;
 import com.ruoyi.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.ruoyi.base.mapper.BaseSkuTypeMapper;
-import com.ruoyi.base.domain.BaseSkuType;
-import com.ruoyi.base.service.IBaseSkuTypeService;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
+
 /**
  * 物料分类Service业务层处理
  *
@@ -108,4 +109,9 @@ public class BaseSkuTypeServiceImpl implements IBaseSkuTypeService {
             return baseSkuTypeMapper.insertBaseSkuType(baseSkuType);
         }
     }
+
+    @Override
+    public List<BaseSkuType> queryBaseSkuTypeList(List<Long> skuTypeCodeList){
+        return baseSkuTypeMapper.selectList(Wrappers.<BaseSkuType>lambdaQuery().in(BaseSkuType::getItemCode, skuTypeCodeList));
+    }
 }