自动化立体仓库 - WMS系统
lty
2025-05-18 4f3d7344d6687342c0b6ed7feb7e89c2ca02b641
#pda盘点入库开发
9个文件已修改
1个文件已添加
67 ■■■■ 已修改文件
src/main/java/com/zy/asrs/controller/MobileController.java 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/entity/WaitPakin.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/entity/param/PickInParam.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/WrkDetlService.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/common/web/WcsController.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/common/web/param/SearchLocParam.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/WrkDetlMapper.xml 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/MobileController.java
@@ -9,10 +9,7 @@
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.CombParam;
import com.zy.asrs.entity.param.GDYKConfirmGoodsParam;
import com.zy.asrs.entity.param.MobileAdjustParam;
import com.zy.asrs.entity.param.OffSaleParam;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.MobileAdjustResult;
import com.zy.asrs.mapper.ManLocDetlMapper;
import com.zy.asrs.service.*;
@@ -169,6 +166,19 @@
        return R.ok("组托成功");
    }
    @RequestMapping("/pickIn/auth")
//    @ManagerAuth(memo="盘点入库")
    public R pickIn(@RequestParam String barcode){
        WrkMast wrkMast = wrkMastService.selectByBarcode(barcode);
        List<PickInParam> param = wrkDetlService.selectDetByBarcode(barcode);
        for(PickInParam pickInParam : param){
            pickInParam.setStaNo(wrkMast.getStaNo());
            pickInParam.setWorkNo(wrkMast.getWrkNo());
        }
        return R.ok().add(param);
    }
    @RequestMapping("/pack/get/auth")
    @ManagerAuth
    public R packGet(@RequestParam String barcode) {
src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -85,7 +85,7 @@
    @TableField("safe_qty")
    private Double safeQty;
    @ApiModelProperty(value= "重量")
    @ApiModelProperty(value= "整托重量")
    private Double weight;
    @ApiModelProperty(value= "长度")
src/main/java/com/zy/asrs/entity/param/PickInParam.java
New file
@@ -0,0 +1,12 @@
package com.zy.asrs.entity.param;
import lombok.Data;
@Data
public class PickInParam {
    private Integer staNo;
    private Integer workNo;
    private String matnr;
    private String maktx;
    private Double anfme;
}
src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.param.PickInParam;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
@@ -30,4 +31,5 @@
    List<WrkDetl> selectAndLogByOrderNoGroupByMatnrOfSum(String orderNo);
    int updateIoTimeWms(@Param("workNo") Integer workNo, @Param("ioTime") Date ioTime);
    List<PickInParam> selectDetByBarcode(@Param("barcode") String barcode);
}
src/main/java/com/zy/asrs/service/WrkDetlService.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.param.PickInParam;
import com.zy.common.model.DetlDto;
import java.util.Date;
@@ -26,4 +27,6 @@
    List<WrkDetl> selectAndLogByOrderNoGroupByMatnrOfSum(String orderNo);
    boolean updateIoTimeWms(Integer wrkNo, Date now);
    List<PickInParam> selectDetByBarcode(String barcode);
}
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -1116,7 +1116,7 @@
        }
        LocTypeDto locTypeDto = new LocTypeDto();
        locTypeDto.setLocType1((short) 1);
        return wcsController.startupFullPutStore(301, list.get(0).getZpallet(), locTypeDto, list);
        return wcsController.startupFullPutStore(301, list.get(0).getZpallet(), 0.0, locTypeDto, list);
    }
    @Override
src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
@@ -5,6 +5,7 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.Mat;
import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.param.PickInParam;
import com.zy.asrs.mapper.WrkDetlMapper;
import com.zy.asrs.service.MatService;
import com.zy.asrs.service.WrkDetlService;
@@ -21,6 +22,10 @@
    @Autowired
    private MatService matService;
    @Autowired
    private WrkDetlService wrkDetlService;
    @Autowired
    private WrkDetlMapper wrkDetlMapper;
    @Override
    @Transactional
@@ -92,4 +97,8 @@
    public boolean updateIoTimeWms(Integer workNo, Date ioTime) {
        return this.baseMapper.updateIoTimeWms(workNo, ioTime) > 0;
    }
    @Override
    public List<PickInParam> selectDetByBarcode(String barcode){
        return this.baseMapper.selectDetByBarcode(barcode);
    }
}
src/main/java/com/zy/common/web/WcsController.java
@@ -105,7 +105,7 @@
        switch (param.getIoType()) {
            case 1://满托盘入库
                assert waitPakins != null;
                dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), locTypeDto, waitPakins);
                dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(),param.getWeight(), locTypeDto, waitPakins);
                break;
            case 10://空托盘入库
                dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, param.getBarcode());
@@ -321,7 +321,7 @@
     * 全板入库
     */
    @Transactional
    public StartupDto startupFullPutStore(Integer devpNo, String barcode, LocTypeDto locTypeDto, List<WaitPakin> waitPakins) {
    public StartupDto startupFullPutStore(Integer devpNo, String barcode,Double weight, LocTypeDto locTypeDto, List<WaitPakin> waitPakins) {
        // 源站点状态检测
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
        // 检索库位
@@ -347,6 +347,7 @@
        wrkMast.setExitMk("N"); // 退出
        wrkMast.setEmptyMk("N"); // 空板
        wrkMast.setLinkMis("Y");
        wrkMast.setScWeight(weight);
        wrkMast.setCtnType(sourceStaNo.getCtnType()); // 容器类型
        // 操作人员数据
        wrkMast.setAppeTime(now);
@@ -386,6 +387,7 @@
        Wrapper<WaitPakin> wrapper = new EntityWrapper<WaitPakin>()
                .eq("zpallet", barcode);
        WaitPakin setParam = new WaitPakin();
        setParam.setWeight(weight);//将整托重量记入通知档
        setParam.setLocNo(dto.getLocNo());
        setParam.setIoStatus("Y");
        setParam.setModiTime(now);
src/main/java/com/zy/common/web/param/SearchLocParam.java
@@ -17,4 +17,6 @@
    // 库位规格( 0:未知, 1:低库位, 2:高库位)
    private Short locType1;
    private Double weight;
}
src/main/resources/mapper/WrkDetlMapper.xml
@@ -164,5 +164,16 @@
        where 1=1
        and wrk_no = #{workNo}
    </update>
    <resultMap id="PickInMap" type="com.zy.asrs.entity.param.PickInParam">
        <result column="matnr" property="matnr" />
        <result column="maktx" property="maktx" />
        <result column="anfme" property="anfme" />
        <result column="wrk_no" property="workNo"/>
    </resultMap>
    <select id="selectDetByBarcode" resultMap="PickInMap">
        select matnr,maktx,anfme,wrk_no
        from asr_wrk_detl
        where zpallet = #{barcode}
    </select>
</mapper>