Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

skyouc

10 天以前 e98be9d02d12b0453c6267190b86fdbc11fee9fc

Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasDeviceController.java

File was deleted

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java

@@ -165,7 +165,7 @@
        if (Objects.isNull(map.get("ids"))) {
            locs = locService.list();
        } else {
            locs = locService.list(new LambdaQueryWrapper<Loc>().in(Loc::getId , map.get("ids")).eq(Loc::getStatus, 1));
            locs = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getStatus, 1));
        }
        ExcelUtil.build(ExcelUtil.create(locs, Loc.class), response);
    }

 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasDevice.java

File was deleted

 rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/BasDeviceMapper.java

File was deleted

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/BasDeviceService.java

File was deleted

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/BasDeviceServiceImpl.java

File was deleted

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/DeviceSiteServiceImpl.java

@@ -1,10 +1,8 @@
package com.vincent.rsf.server.manager.service.impl;

import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.manager.controller.params.DeviceSiteParame;
import com.vincent.rsf.server.manager.entity.BasDevice;
import com.vincent.rsf.server.manager.entity.BasStation;
import com.vincent.rsf.server.manager.mapper.DeviceSiteMapper;
import com.vincent.rsf.server.manager.entity.DeviceSite;

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java

@@ -582,11 +582,9 @@
                    throw new CoolException("更新组托状态失败！！");
                }
            }
            Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, task.getTaskType() < TaskStsType.UPDATED_IN.id ? task.getTargLoc() : task.getOrgLoc()));
            if (null != loc
                    && (loc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_S.type)
                    || loc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_R.type))) {

            Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, task.getTaskType() < TaskStsType.UPDATED_IN.id ? task.getTargLoc() : task.getOrgLoc()));
            if (null != loc && (loc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_S.type) || loc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_R.type))) {
                loc.setUseStatus(LocStsType.LOC_STS_TYPE_O.type);
                if (!locService.updateById(loc)) {
                    throw new CoolException("更新库位状态失败！！");
@@ -607,8 +605,7 @@
                ) {
                    basStation = basStationService.getOne(new LambdaQueryWrapper<BasStation>()
                            .eq(BasStation::getStationName, task.getTargLoc())
                            .eq(BasStation::getUseStatus, LocStsType.LOC_STS_TYPE_R.type)
                    );
                            .eq(BasStation::getUseStatus, LocStsType.LOC_STS_TYPE_R.type));
                }
                if (null == basStation) {
                    throw new CoolException("站点状态错误！！");
@@ -618,6 +615,10 @@
                    throw new CoolException("更新站点状态失败！！");
                }
            }

            if (!taskItemService.remove(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()))) {
                throw new CoolException("任务明细删除失败！！");
            }
        }
        if (!this.removeByIds(Arrays.asList(ids))) {
            throw new CoolException("Delete Fail");

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java

@@ -149,7 +149,7 @@

        }

        double sum1 = items.stream().mapToDouble(WaitPakinItem::getAnfme).sum();
        Double sum1 = items.stream().mapToDouble(WaitPakinItem::getAnfme).sum();

        if (!waitPakinItemService.saveBatch(items)) {
            throw new CoolException("组托明细保存失败！！");
@@ -161,9 +161,10 @@
            if (Objects.isNull(one)) {
                throw new CoolException("收货区数据错误！！");
            }
//            one.setAnfme(one.getAnfme() - pakinItem.getAnfme())
            one.setWorkQty(one.getWorkQty() + pakinItem.getAnfme() + one.getQty());
            if (one.getWorkQty() > one.getAnfme()) {
            Double workQty = Math.round((one.getWorkQty() + pakinItem.getAnfme()) * 10000) / 10000.0;
            Double qty = Math.round((workQty + one.getQty()) * 10000) / 10000.0;
            one.setWorkQty(workQty);
            if (qty.compareTo(one.getAnfme()) > 0) {
                throw new CoolException("组托数量不能大于收货数量！！");
            }
            if (!warehouseAreasItemService.saveOrUpdate(one)) {
@@ -175,9 +176,6 @@
        if (!this.updateById(waitPakin1)) {
            throw new CoolException("组托数量修改失败！！");
        }

        //TODO 组托完成后，扣减收货区库存

        return pakin;
    }


 rsf-server/src/main/resources/mapper/manager/BasDeviceMapper.xml

File was deleted