#

Junjie

2024-05-21 b4adeadaceaed7cd5b5ae9b785fb375c71a33ecd

#

 zy-asrs-common/src/main/java/com/zy/asrs/common/web/AuthController.java

@@ -71,9 +71,9 @@
            return R.parse(CodeRes.USER_10003);
        }
        String system = null;//登陆系统
        if (wms) {
        if (wms != null && wms) {
            system = String.valueOf(LoginSystemType.WMS);
        }else {
        } else {
            system = String.valueOf(LoginSystemType.WCS);
        }
        String token = Cools.enToken(System.currentTimeMillis() + username, user.getPassword());

 zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkMast.java

@@ -186,9 +186,12 @@
    @ApiModelProperty(value= "invWh")
    private String invWh;

    @ApiModelProperty(value= "堆垛机号")
    private Integer crnNo;

    public WrkMast() {}

    public WrkMast(Integer wrkNo,Long wrkSts,Integer ioType,Double ioPri,String locNo,Integer staNo,Integer sourceStaNo,String sourceLocNo,String picking,String exitMk,Integer pltType,String emptyMk,Date ioTime,Integer ctnType,String modiUser,Date modiTime,String appeUser,Date appeTime,Date errorTime,String errorMemo,String manuType,String memo,String barcode,String fullPlt,Long hostId) {
    public WrkMast(Integer wrkNo, Long wrkSts, Integer ioType, Double ioPri, String locNo, Integer staNo, Integer sourceStaNo, String sourceLocNo, String picking, String exitMk, Integer pltType, String emptyMk, Date ioTime, Integer ctnType, String modiUser, Date modiTime, String appeUser, Date appeTime, Date errorTime, String errorMemo, String manuType, String memo, String barcode, String fullPlt, Long hostId, String oveMk, String invWh, Integer crnNo) {
        this.wrkNo = wrkNo;
        this.wrkSts = wrkSts;
        this.ioType = ioType;
@@ -214,9 +217,12 @@
        this.barcode = barcode;
        this.fullPlt = fullPlt;
        this.hostId = hostId;
        this.oveMk = oveMk;
        this.invWh = invWh;
        this.crnNo = crnNo;
    }

//    WrkMast wrkMast = new WrkMast(
    //    WrkMast wrkMast = new WrkMast(
//            null,    // 工作号[非空]
//            null,    // 工作状态
//            null,    // 入出库类型

 zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkMastLog.java

@@ -185,6 +185,9 @@
    @ApiModelProperty(value= "invWh")
    private String invWh;

    @ApiModelProperty(value= "堆垛机号")
    private Integer crnNo;

    public WrkMastLog() {}

    public WrkMastLog(Long id,Integer wrkNo,Long wrkSts,Integer ioType,Double ioPri,String locNo,Integer staNo,Integer sourceStaNo,String sourceLocNo,String picking,String exitMk,Integer pltType,String emptyMk,Date ioTime,Integer ctnType,String modiUser,Date modiTime,String appeUser,Date appeTime,Date errorTime,String errorMemo,String manuType,String memo,String barcode,String fullPlt,Long hostId) {

 zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/WorkService.java

@@ -19,6 +19,13 @@
    String startupFullPutStore(FullStoreParam param, Long userId, Long hostId);

    /**
     * 空板入库
     *
     * @return 库位号
     */
    String emptyPlateIn(Integer sourceStaNo, Long userId, Long hostId);

    /**
     * 出库作业
     */
    void startupFullTakeStore(StockOutParam param, Long userId, Long hostId);

 zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/LocMastServiceImpl.java

@@ -50,7 +50,7 @@
    @Override
    public LocMast findNearloc(String locNo, Long hostId, LocRangeDto locRangeDto) {
        LocMast locMast = null;
        List<String> groupOuterLoc = Utils.getGroupOuterLoc(locNo, hostId);
        List<String> groupOuterLoc = Utils.getGroupInnerLoc(locNo, hostId);
        if (!Cools.isEmpty(groupOuterLoc)) {
            LambdaQueryWrapper<LocMast> wrapper = new LambdaQueryWrapper<LocMast>()
                    .eq(LocMast::getLocSts, 'O')

 zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java

@@ -94,6 +94,7 @@
        wrkMast.setModiUser(String.valueOf(userId));
        wrkMast.setModiTime(now);
        wrkMast.setHostId(hostId);
        wrkMast.setCrnNo(dto.getCrnNo());
        if (!wrkMastService.save(wrkMast)) {
            throw new CoolException("保存工作档失败");
        }
@@ -149,6 +150,64 @@
    }

    @Override
    public String emptyPlateIn(Integer devpNo, Long userId, Long hostId) {
        // 源站点状态检测
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true, hostId);
        // 检索库位
        LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
        StartupDto dto = commonService.getLocNo(10, devpNo, null, null, hostId, locTypeDto, 0);
        int workNo = dto.getWorkNo();
        // 生成工作档
        WrkMast wrkMast = new WrkMast();
        wrkMast.setWrkNo(workNo);
        wrkMast.setIoTime(new Date());
        wrkMast.setWrkSts(1L); // 工作状态：生成入库ID
        wrkMast.setIoType(10); // 入出库状态：10.空板入库
        wrkMast.setIoPri(13D); // 优先级：13
        wrkMast.setCrnNo(dto.getCrnNo());
        wrkMast.setSourceStaNo(dto.getSourceStaNo());
        wrkMast.setStaNo(dto.getStaNo());
        wrkMast.setLocNo(dto.getLocNo());
        wrkMast.setFullPlt("N"); // 满板
        wrkMast.setPicking("N"); // 拣料
        wrkMast.setExitMk("N"); // 退出
        wrkMast.setEmptyMk("Y"); // 空板
        wrkMast.setCtnType(sourceStaNo.getCtnType()); // 容器类型
        // 操作人员数据
        wrkMast.setAppeUser(String.valueOf(userId));
        wrkMast.setAppeTime(new Date());
        wrkMast.setModiUser(String.valueOf(userId));
        wrkMast.setModiTime(new Date());
        wrkMast.setHostId(hostId);
        boolean res = wrkMastService.save(wrkMast);
        if (!res) {
            throw new CoolException("保存工作档失败");
        }
        // 更新源站点信息
        sourceStaNo.setWrkNo(workNo);
        sourceStaNo.setModiUser(userId);
        sourceStaNo.setModiTime(new Date());
        if (!basDevpService.updateById(sourceStaNo)){
            throw new CoolException("更新源站失败");
        }
        // 更新目标库位状态
        LocMast locMast = locMastService.getOne(new LambdaQueryWrapper<LocMast>()
                .eq(LocMast::getLocNo, dto.getLocNo())
                .eq(LocMast::getHostId, hostId));
        if (locMast.getLocSts().equals("O")){
            locMast.setLocSts("S"); // S.入库预约
            locMast.setModiUser(userId);
            locMast.setModiTime(new Date());
            if (!locMastService.updateById(locMast)){
                throw new CoolException("改变库位状态失败");
            }
        } else {
            throw new CoolException(dto.getLocNo()+"目标库位已被占用");
        }
        return dto.getLocNo();
    }

    @Override
    @Transactional
    public void startupFullTakeStore(StockOutParam param, Long userId, Long hostId) {
        // 获取库位明细

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WorkController.java

@@ -80,6 +80,12 @@
        return R.ok("入库启动成功").add(workService.startupFullPutStore(fullStoreParam, getUserId(), getHostId()));
    }

    @RequestMapping("/empty/plate/in/start")
    @ManagerAuth(memo = "空板入库")
    public R emptyPlateInStart(@RequestParam Integer sourceStaNo) {
        return R.ok("入库启动成功").add(workService.emptyPlateIn(sourceStaNo, getUserId(), getHostId()));
    }

    @RequestMapping("/plate/out/start")
    @ManagerAuth(memo = "出库作业")
    public R fullStoreTakeStart(@RequestBody StockOutParam param) {

 zy-asrs-wms/src/main/webapp/views/index.html

@@ -27,7 +27,7 @@
  <!-- 头部 -->
  <div class="layui-header">
    <div class="layui-logo">
      <img src="../static/image/logo.png" style="display: inline-block; width: 60%;height: auto">
<!--      <img src="../static/image/logo.png" style="display: inline-block; width: 60%;height: auto">-->
      <!--          <span style="margin-top: 0; letter-spacing: 10px">中扬立库</span>-->
      <!--          <img src="../static/image/logo.svg"/>-->
      <!--          <cite>中扬 - Zoneyung</cite>-->