#暂存

LSH

2022-11-01 ceab4f0f12788f69f685c56e4626625d3f9dea1e

#暂存

 src/main/java/com/zy/asrs/mapper/LocMastMapper.java

@@ -14,7 +14,7 @@
public interface LocMastMapper extends BaseMapper<LocMast> {

    List<LocMast> queryFreeLocMast(@Param("rows") List<Integer> rows, @Param("rowsLen") Integer rowsLen, @Param("locType1") Short locType1);
    List<LocMast> queryFreeLocMast2(@Param("rows") List<Integer> rows, @Param("rowsLen") Integer rowsLen, @Param("locType1") Short locType1, @Param("inout_everyday") Boolean inoutEveryday);
    List<LocMast> queryFreeLocMast2(@Param("rows") List<Integer> rows, @Param("rowsLen") Integer rowsLen, @Param("locType1") Short locType1, @Param("inoutEveryday") Boolean inoutEveryday);

    @Select("select loc_no from asr_loc_mast where 1=1 and loc_sts = 'O' and crn_no = #{crnNo}")
    List<String> queryGroupEmptyStock(Integer crnNo);

 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java

@@ -884,24 +884,26 @@
        // 订单关联
        List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
        for (WrkDetl wrkDetl : wrkDetls) {
            String[] orderNos = GetOrderNo(wrkDetl.getOrderNo());
            String[] anfmes = GetAnfme(wrkDetl.getOrderNo());
            int i = 0;
            for (String orderNo : orderNos) {
                if (!Cools.isEmpty(orderNo)) {
                    Double anfme = Integer.parseInt(anfmes[i]) + 0.0;
                    i++;
                    if (BaseController.isJSON(wrkDetl.getOrderNo())) {
                        if (!orderDetlService.decrease(orderNo, wrkDetl.getMatnr(), wrkDetl.getBatch(), anfme)) {
                            throw new CoolException("订单数据回滚失败");
                        }
                    } else {
                        // 订单合并出库
                        List<OrderDto> orderDtoList = JSON.parseArray(wrkDetl.getOrderNo(), OrderDto.class);
                        for (OrderDto orderDto : orderDtoList) {
                            if (!orderDetlService.decrease(orderDto.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), orderDto.getAnfme())) {
            if (!Cools.isEmpty(wrkDetl.getOrderNo())){
                String[] orderNos = GetOrderNo(wrkDetl.getOrderNo());
                String[] anfmes = GetAnfme(wrkDetl.getOrderNo());
                int i = 0;
                for (String orderNo : orderNos) {
                    if (!Cools.isEmpty(orderNo)) {
                        Double anfme = Integer.parseInt(anfmes[i]) + 0.0;
                        i++;
                        if (BaseController.isJSON(wrkDetl.getOrderNo())) {
                            if (!orderDetlService.decrease(orderNo, wrkDetl.getMatnr(), wrkDetl.getBatch(), anfme)) {
                                throw new CoolException("订单数据回滚失败");
                            }
                        } else {
                            // 订单合并出库
                            List<OrderDto> orderDtoList = JSON.parseArray(wrkDetl.getOrderNo(), OrderDto.class);
                            for (OrderDto orderDto : orderDtoList) {
                                if (!orderDetlService.decrease(orderDto.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), orderDto.getAnfme())) {
                                    throw new CoolException("订单数据回滚失败");
                                }
                            }
                        }
                    }
                }

 src/main/java/com/zy/common/service/CommonService.java

@@ -277,6 +277,9 @@
            List<Integer> rows = Utils.getGroupLoc(curRow);

            Mat mat = matService.selectByMatnr(matNos.get(0));
            if (Cools.isEmpty(mat.getInoutEveryday())){
                mat.setInoutEveryday(false);
            }
            List<LocMast> locMasts = locMastService.queryFreeLocMast2(rows, rows.size(), locTypeDto.getLocType1(),mat.getInoutEveryday());
            if (!Cools.isEmpty(locMasts)) {
                Integer innermostRow = Utils.getInnermostRow(locMasts.get(0).getLocNo());

 src/main/resources/mapper/LocMastMapper.xml

@@ -82,11 +82,11 @@
        *
        from asr_loc_mast
        where 1=1
        <if test="inoutEveryday == 2.0">
            and bay1 >= 10
        <if test="inoutEveryday == false ">
            and bay1 > 10
        </if>
        <if test="inoutEveryday != 2.0">
            and bay1 &lt; 10
        <if test="inoutEveryday == true">
            and bay1 &lt; 11
        </if>
        and row1 in
        <foreach item="item" collection="rows" index="index"  separator="," open="(" close=")">