#

Junjie

2024-05-30 ba09c6c753de16da201e4d04ff77c549358c9fc3

#

 zy-asrs-common/src/main/java/com/zy/asrs/common/domain/param/PickConfirmParam.java

New file
@@ -0,0 +1,16 @@
package com.zy.asrs.common.domain.param;

import lombok.Data;

import java.util.List;

@Data
public class PickConfirmParam {

    private String locNo;

    private Integer staNo;

    private List<PickMatParam> list;

}

 zy-asrs-common/src/main/java/com/zy/asrs/common/domain/param/PickMatParam.java

New file
@@ -0,0 +1,20 @@
package com.zy.asrs.common.domain.param;

import lombok.Data;

@Data
public class PickMatParam {

    private String matnr;

    private String batch;

    private String orderNo;

    private Long orderId;

    private Double count;

    private Double useCount;

}

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

@@ -57,9 +57,12 @@
    @ApiModelProperty(value= "数量")
    private Double anfme;

    @ApiModelProperty(value= "")
    @ApiModelProperty(value= "已完成数量")
    private Double qty;

    @ApiModelProperty(value= "作业数量")
    private Double workQty;

    /**
     * 商品编码
     */

 zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/OrderDetlMapper.java

@@ -19,10 +19,16 @@

    OrderDetl selectItem(@Param("orderId") Long orderId, @Param("matnr") String matnr, @Param("batch") String batch);

    OrderDetl selectItem2(@Param("orderNo") String orderNo, @Param("matnr") String matnr, @Param("batch") String batch);

    IPage<OrderDetl> getPakoutPage(Page<OrderDetl> page ,Map<String, Object> map);

    int increase(@Param("orderId") Long orderId, @Param("hostId") Long hostId, @Param("matnr") String matnr, @Param("batch") String batch, @Param("qty") Double qty);

    int decrease(@Param("orderNo") String orderNo, @Param("hostId") Long hostId, @Param("matnr") String matnr, @Param("batch") String batch, @Param("qty") Double qty);

    int increaseQtyByOrderNo(@Param("orderNo")String orderNo, @Param("matnr")String matnr, @Param("batch")String batch, @Param("qty")Double qty);

    int increaseWorkQtyByOrderNo(@Param("orderNo")String orderNo, @Param("matnr")String matnr, @Param("batch")String batch, @Param("qty")Double qty);

}

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

@@ -10,10 +10,16 @@

    OrderDetl selectItem(Long orderId, String matnr, String batch);

    OrderDetl selectItem(String orderNo, String matnr, String batch);

    IPage<OrderDetl> getPakoutPage(Integer curr, Integer limit, Map<String, Object> map);

    boolean increase(Long orderId, Long hostId, String matnr, String batch, Double qty);

    boolean decrease(String orderNo, Long hostId, String matnr, String batch, Double qty);

    boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, Double qty);

    boolean increaseWorkQtyByOrderNo(String orderNo, String matnr, String batch, Double qty);

}

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

@@ -19,6 +19,11 @@
    }

    @Override
    public OrderDetl selectItem(String orderNo, String matnr, String batch) {
        return this.baseMapper.selectItem2(orderNo, matnr, batch);
    }

    @Override
    public IPage<OrderDetl> getPakoutPage(Integer curr, Integer limit, Map<String, Object> map) {
        Page<OrderDetl> page = new Page<>(curr, limit);
        return this.baseMapper.getPakoutPage(page, map);
@@ -39,4 +44,13 @@
        }
    }

    @Override
    public boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, Double qty) {
        return this.baseMapper.increaseQtyByOrderNo(orderNo, matnr, batch, qty) > 0;
    }

    @Override
    public boolean increaseWorkQtyByOrderNo(String orderNo, String matnr, String batch, Double qty) {
        return this.baseMapper.increaseWorkQtyByOrderNo(orderNo, matnr, batch, qty) > 0;
    }
}

 zy-asrs-common/src/main/resources/mapper/wms/OrderDetlMapper.xml

@@ -39,6 +39,21 @@
        </choose>
    </select>

    <select id="selectItem2" resultType="com.zy.asrs.common.wms.entity.OrderDetl">
        select * from wms_order_detl
        where 1=1
        and order_no = #{orderNo}
        and matnr = #{matnr}
        <choose>
            <when test="batch != null and batch != ''">
                and batch = #{batch}
            </when>
            <otherwise>
                and (batch IS NULL OR batch = '')
            </otherwise>
        </choose>
    </select>

    <select id="getPakoutPage" resultType="com.zy.asrs.common.wms.entity.OrderDetl">
        select
        mod.*
@@ -86,4 +101,36 @@
        </choose>
    </update>

    <update id="increaseQtyByOrderNo">
        update wms_order_detl
        set qty = qty + #{qty}
        where 1=1
        and order_no = #{orderNo}
        and matnr = #{matnr}
        <choose>
            <when test="batch != null and batch != ''">
                and batch = #{batch}
            </when>
            <otherwise>
                and (batch IS NULL OR batch = '')
            </otherwise>
        </choose>
    </update>

    <update id="increaseWorkQtyByOrderNo">
        update wms_order_detl
        set work_qty = work_qty + #{qty}
        where 1=1
        and order_no = #{orderNo}
        and matnr = #{matnr}
        <choose>
            <when test="batch != null and batch != ''">
                and batch = #{batch}
            </when>
            <otherwise>
                and (batch IS NULL OR batch = '')
            </otherwise>
        </choose>
    </update>

</mapper>

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

@@ -1,10 +1,16 @@
package com.zy.asrs.wms.controller;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.asrs.common.domain.dto.LocDetlDto;
import com.zy.asrs.common.domain.dto.WrkDto;
import com.zy.asrs.common.domain.entity.MobileAdjustResult;
import com.zy.asrs.common.domain.entity.StaDesc;
import com.zy.asrs.common.domain.enums.WorkNoType;
import com.zy.asrs.common.domain.param.MobileAdjustParam;
import com.zy.asrs.common.domain.param.PickConfirmParam;
import com.zy.asrs.common.domain.param.PickMatParam;
import com.zy.asrs.common.openapi.entity.param.CombParam;
import com.zy.asrs.common.sys.service.StaDescService;
import com.zy.asrs.common.web.BaseController;
import com.zy.asrs.common.wms.entity.*;
import com.zy.asrs.common.wms.service.*;
@@ -47,6 +53,16 @@
    private RolePermissionService rolePermissionService;
    @Autowired
    private PermissionService permissionService;
    @Autowired
    private LocMastService locMastService;
    @Autowired
    private StaDescService staDescService;
    @Autowired
    private OrderDetlService orderDetlService;
    @Autowired
    private CommonService commonService;
    @Autowired
    private MatService matService;

    @RequestMapping("/pda/WarehouseIn")
    @ManagerAuth
@@ -292,4 +308,194 @@
        return R.ok("盘点成功");
    }

    @RequestMapping("/loc/f/list")
    @ManagerAuth(memo = "获取在库库位")
    public R locNoF(@RequestParam(required = false) String locNo){
        LambdaQueryWrapper<LocMast> wrapper = new LambdaQueryWrapper<LocMast>()
                .eq(LocMast::getLocSts, "F")
                .eq(LocMast::getHostId, getHostId());
        if (!Cools.isEmpty(locNo)) {
            wrapper.like(LocMast::getLocNo, locNo);
        }
        List<LocMast> list = locMastService.list(wrapper);
        return R.ok().add(list);
    }

    @RequestMapping("/pick/sta/list")
    @ManagerAuth(memo = "获取并板站")
    public R pickSta(){
        List<StaDesc> list = staDescService.list(new LambdaQueryWrapper<StaDesc>()
                .eq(StaDesc::getTypeNo, 104)
                .eq(StaDesc::getHostId, getHostId()));
        return R.ok().add(list);
    }

    @RequestMapping("/pick/mat/list")
    @ManagerAuth(memo = "获取并板物料")
    public R pickMats(@RequestParam(required = false) String matnr){
        List<DocType> docTypes = docTypeService.list(new LambdaQueryWrapper<DocType>().like(DocType::getDocName, "入库"));
        ArrayList<Long> typeList = new ArrayList<>();
        for (DocType docType : docTypes) {
            typeList.add(docType.getDocId());
        }

        LambdaQueryWrapper<Order> wrapper = new LambdaQueryWrapper<>();
        wrapper.eq(Order::getStatus, 1);
        wrapper.eq(Order::getHostId, getHostId());
        wrapper.in(Order::getDocType, typeList);
        List<Order> orders = orderService.list(wrapper);

        ArrayList<Long> orderIds = new ArrayList<>();
        for (Order order : orders) {
            orderIds.add(order.getId());
        }

        //搜索明细
        LambdaQueryWrapper<OrderDetl> wrapper1 = new LambdaQueryWrapper<>();
        wrapper1.eq(OrderDetl::getStatus, 1);
        wrapper1.eq(OrderDetl::getHostId, getHostId());
        wrapper1.in(OrderDetl::getOrderId, orderIds);
        if (!Cools.isEmpty(matnr)) {
            wrapper1.like(OrderDetl::getMatnr, matnr);
        }

        List<OrderDetl> list = orderDetlService.list(wrapper1);

        ArrayList<PickMatParam> maps = new ArrayList<>();
        for (OrderDetl orderDetl : list) {
            //剩余可用数量
            double count = orderDetl.getAnfme() - orderDetl.getWorkQty();
            if (count <= 0) {
                continue;
            }

            PickMatParam matParam = new PickMatParam();
            matParam.setMatnr(orderDetl.getMatnr());
            matParam.setBatch(orderDetl.getBatch());
            matParam.setOrderNo(orderDetl.getOrderNo());
            matParam.setOrderId(orderDetl.getOrderId());
            matParam.setCount(count);
            maps.add(matParam);
        }
        return R.ok().add(maps);
    }

    @RequestMapping("/pick/in")
    @ManagerAuth(memo = "并板入库")
    @Transactional
    public R pickConfirm(@RequestBody PickConfirmParam param){
        LocMast locMast = locMastService.getOne(new LambdaQueryWrapper<LocMast>()
                .eq(LocMast::getLocNo, param.getLocNo())
                .eq(LocMast::getHostId, getHostId()));
        if (!locMast.getLocSts().equals("F")) {
            return R.error("库位状态不是在库");
        }

        StaDesc staDesc = staDescService.getOne(new LambdaQueryWrapper<StaDesc>()
                .eq(StaDesc::getTypeNo, 104)
                .eq(StaDesc::getStnNo, param.getStaNo())
                .eq(StaDesc::getHostId, getHostId()));
        if (staDesc == null) {
            return R.error("站点不存在");
        }

        //检验传参是否和订单明细匹配
        for (PickMatParam matParam : param.getList()) {
            LambdaQueryWrapper<OrderDetl> wrapper = new LambdaQueryWrapper<OrderDetl>()
                    .eq(OrderDetl::getOrderNo, matParam.getOrderNo())
                    .eq(OrderDetl::getHostId, getHostId())
                    .eq(OrderDetl::getStatus, 1)
                    .eq(OrderDetl::getMatnr, matParam.getMatnr());
            if (!Cools.isEmpty(matParam.getBatch())) {
                wrapper.eq(OrderDetl::getBatch, matParam.getBatch());
            }
            OrderDetl orderDetl = orderDetlService.getOne(wrapper);
            if (orderDetl == null) {
                return R.error("物料数据不存在");
            }

            //剩余可用数量
            double count = orderDetl.getAnfme() - orderDetl.getWorkQty();
            if (matParam.getCount() != count) {
                return R.error("物料数据已过期");
            }

            if (matParam.getUseCount() > count) {
                return R.error("可用数量不足");
            }
        }

        Date now = new Date();
        // 生成工作号
        int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(104));
        // 生成工作档
        WrkMast wrkMast = new WrkMast();
        wrkMast.setWrkNo(workNo);
        wrkMast.setIoTime(now);
        wrkMast.setWrkSts(101L); // 工作状态：101.生成出库
        wrkMast.setIoType(104); // 入出库状态
        wrkMast.setIoPri(13D); // 优先级：13
        wrkMast.setSourceStaNo(staDesc.getDeviceStn()); // 源站
        wrkMast.setStaNo(staDesc.getStnNo()); // 目标站
        wrkMast.setSourceLocNo(param.getLocNo()); // 源库位
        wrkMast.setFullPlt("Y"); // 满板：Y
        wrkMast.setPicking("Y"); // 拣料
        wrkMast.setExitMk("N"); // 退出
        wrkMast.setEmptyMk("N"); // 空板
        wrkMast.setBarcode(locMast.getBarcode());
        wrkMast.setAppeUser(String.valueOf(getUserId())); // 操作人员数据
        wrkMast.setAppeTime(now);
        wrkMast.setModiUser(String.valueOf(getUserId()));
        wrkMast.setModiTime(now);
        wrkMast.setHostId(getHostId());
        wrkMast.setCrnNo(staDesc.getDeviceNo());
        if (!wrkMastService.save(wrkMast)) {
            throw new CoolException("保存工作档失败，出库库位号：" + param.getLocNo());
        }
        // 生成工作档明细
        for (PickMatParam matParam : param.getList()) {
            LambdaQueryWrapper<Mat> wrapper = new LambdaQueryWrapper<>();
            wrapper.eq(Mat::getHostId, getHostId());
            wrapper.eq(Mat::getStatus, 1);
            wrapper.eq(Mat::getMatnr, matParam.getMatnr());
            Mat mat = matService.getOne(wrapper);
            if (mat == null) {
                throw new CoolException("保存工作档失败，物料信息不存在：" + matParam.getMatnr());
            }

            WrkDetl wrkDetl = new WrkDetl();
            wrkDetl.sync(mat);
            wrkDetl.setOrderNo(matParam.getOrderNo());
            wrkDetl.setWrkNo(workNo);
            wrkDetl.setIoTime(now);
            wrkDetl.setAnfme(matParam.getUseCount()); // 数量
            wrkDetl.setAppeTime(now);
            wrkDetl.setAppeUser(getUserId());
            wrkDetl.setModiTime(now);
            wrkDetl.setModiUser(getUserId());
            wrkDetl.setHostId(getHostId());
            wrkDetl.setWrkMastId(wrkMast.getId());
            if (!wrkDetlService.save(wrkDetl)) {
                throw new CoolException("保存工作档明细失败");
            }

            //更新订单工作数量
            orderDetlService.increaseWorkQtyByOrderNo(matParam.getOrderNo(), matParam.getMatnr(), matParam.getBatch(), matParam.getUseCount());
        }
        // 修改库位状态:   F.在库 ====>>> R.出库预约/P.拣料/盘点/并板出库中
        locMast = locMastService.getOne(new LambdaQueryWrapper<LocMast>().eq(LocMast::getLocNo, param.getLocNo()).eq(LocMast::getHostId, getHostId()));
        if (locMast.getLocSts().equals("F")) {
            locMast.setLocSts("P");
            locMast.setModiUser(getUserId());
            locMast.setModiTime(now);
            if (!locMastService.updateById(locMast)) {
                throw new CoolException("预约库位状态失败，库位号：" + param.getLocNo());
            }
        } else {
            throw new CoolException(param.getLocNo() + "库位不是在库状态");
        }

        return R.ok();
    }

}

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/WorkMastHandler.java

@@ -1,10 +1,7 @@
package com.zy.asrs.wms.task.handler;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.asrs.common.wms.entity.LocDetl;
import com.zy.asrs.common.wms.entity.LocMast;
import com.zy.asrs.common.wms.entity.WrkDetl;
import com.zy.asrs.common.wms.entity.WrkMast;
import com.zy.asrs.common.wms.entity.*;
import com.zy.asrs.common.wms.service.*;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.wms.task.AbstractHandler;
@@ -36,6 +33,8 @@
    private LocDetlService locDetlService;
    @Autowired
    private WaitPakinService waitPakinService;
    @Autowired
    private OrderDetlService orderDetlService;

    public ReturnT<String> start(WrkMast wrkMast) {
        // 99.入库完成
@@ -192,6 +191,22 @@
                                exceptionHandle("并板入库 ===>> 新增库存明细失败；[workNo={0}],[matnr={1}]", wrkMast.getWrkNo(), wrkDetl.getMatnr());
                            }
                        }

                        // 更新订单完成数量
                        OrderDetl orderDetl = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
                        if (orderDetl == null) {
                            orderDetl = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
                        }
                        try {
                            if(!Cools.isEmpty(orderDetl)){
                                if(!orderDetlService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(),
                                        orderDetl.getBatch(),wrkDetl.getAnfme())){
                                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                                    return FAIL.setMsg("并板入库 ===>> 更新订单完成数量失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
                                }
                            }
                        } catch (Exception ignore){}

                    }
                    // 修改库位状态 Q ====>> F
                    if (locMast.getLocSts().equals("Q")) {