no message

skyouc

5 天以前 34aa40fffdda9155e77a7991ca8c7691102bb0b8

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

@@ -13,17 +13,20 @@
import com.zy.asrs.entity.param.StockOutParam;
import com.zy.asrs.enums.ContainerType;
import com.zy.asrs.enums.LocAreaType;
import com.zy.asrs.enums.LocStsType;
import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.entity.result.FindLocNoAttributeVo;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.OrderInAndOutUtil;
import com.zy.asrs.utils.Utils;
import com.zy.common.constant.MesConstant;
import com.zy.common.model.*;
import com.zy.common.model.enums.IoWorkType;
import com.zy.common.model.enums.WorkNoType;
import com.zy.common.properties.SlaveProperties;
import com.zy.common.service.CommonService;
import com.zy.common.web.WcsController;
import jdk.nashorn.internal.ir.annotations.Ignore;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -105,6 +108,8 @@
    private BasStationDetlService basStationDetlService;
    @Autowired
    private BasAreasService basAreasService;
    @Autowired
    private OrderPakoutServiceImpl orderPakoutService;

    @Override
    @Transactional
@@ -358,6 +363,10 @@

            // 获取路径
            StaDesc staDesc = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), outSta);

            //移走潜库位在库或空板信息
            moveShallowLocByF(staNo, userId, dto, locMast, staDesc, now);

            // 生成工作号
            int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
            // 生成工作档
@@ -415,6 +424,47 @@
                }
            } else {
                throw new CoolException(dto.getLocNo() + "库位不是在库状态");
            }
        }
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void moveShallowLocByF(BasDevp staNo, Long userId, OutLocDto dto, LocMast locMast, StaDesc staDesc, Date now) {
        String shallowLoc = Utils.getShallowLoc(locMast.getLocNo(), MesConstant.deepRows);
        if (!Objects.isNull(shallowLoc)) {
            LocMast locNo = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", shallowLoc));
            if (locNo.getLocSts().equals(LocStsType.LOC_STS_TYPE_F.type) || locNo.getLocSts().equals(LocStsType.LOC_STS_TYPE_D.type)) {
                //TODO 出库前判断是浅库位是否有货，如果有货优先生成移库任务
                BasDevp sourceStaNo = basDevpService.checkSiteStatus(staDesc.getCrnStn(), true);
                sourceStaNo.setLocType1(locMast.getLocType1());
                LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
                StartupDto mvDto = commonService.getLocNo(1, staNo.getDevNo(), 2, null, locTypeDto);
                WrkMast wrkMast = new WrkMast();
                wrkMast.setWrkNo(mvDto.getWorkNo());
                wrkMast.setIoTime(now);
                wrkMast.setWrkSts(1L); // 工作状态：11.移库任务
                wrkMast.setIoType(11); // 入出库状态
                wrkMast.setIoPri(999D); // 优先级：13
                wrkMast.setStaNo("");
                wrkMast.setCrnNo(locNo.getCrnNo());
                //源库位
                wrkMast.setSourceLocNo(locNo.getLocNo()); // 源库位
                //目标库位
                wrkMast.setLocNo(mvDto.getLocNo());
                wrkMast.setFullPlt("Y"); // 满板：Y
                wrkMast.setPicking("N"); // 拣料
                wrkMast.setExitMk("N"); // 退出
                wrkMast.setEmptyMk("N"); // 空板
                wrkMast.setLinkMis("N");
                wrkMast.setBarcode(locNo.getBarcode());
                wrkMast.setAppeUser(userId); // 操作人员数据
                wrkMast.setAppeTime(now);
                wrkMast.setModiUser(userId);
                wrkMast.setModiTime(now);
                if (!wrkMastService.insert(wrkMast)) {
                    throw new CoolException("保存移库工作档失败，移库库位号：" + locNo.getLocNo() + "目标库位号：" + dto.getLocNo());
                }
            }
        }
    }
@@ -682,6 +732,8 @@
            wrkDetl.setWrkNo(workNo)
                    .setId(null)
                    .setIoTime(new Date())
                    .setMatnr(locDto.getMatnr())
                    .setMaktx(locDto.getMaktx())
                    .setOrderNo(locDto.getOrderNo())
                    .setAnfme(locDto.getAnfme())
                    .setBoxType1(locDto.getBoxType1())
@@ -698,11 +750,14 @@
//                throw new CoolException("修改订单明细数量失败");
//            }
//            orderService.updateSettle(orderDetl.getOrderId(), 2L, userId);
            OrderInAndOutUtil.increaseWorkQty(Boolean.FALSE, orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(),
                    orderDetl.getBrand(), orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(),
                    "1", orderDetl.getBoxType2(), orderDetl.getBoxType3()
                    , locDto.getAnfme());
            OrderInAndOutUtil.updateOrder(Boolean.FALSE, orderDetl.getOrderId(), 2L, userId);
            OrderPakout orderNo = orderPakoutService.selectOne(new EntityWrapper<OrderPakout>().eq("order_no", orderDetl.getOrderNo()));
            if (!Objects.isNull(orderNo)) {
                OrderInAndOutUtil.increaseWorkQty(Boolean.FALSE, orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(),
                        orderDetl.getBrand(), orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(),
                        "1", orderDetl.getBoxType2(), orderDetl.getBoxType3()
                        , locDto.getAnfme());
                OrderInAndOutUtil.updateOrder(Boolean.FALSE, orderDetl.getOrderId(), 2L, userId);
            }
        }
        // 修改库位状态:   F.在库 ====>>> R.出库预约/P.拣料/盘点/并板出库中

@@ -1544,7 +1599,23 @@
        wrkMast.setIoType(wrkMast.getIoType() - 50); // 入出库类型: 103->53,104->54,107->57
        wrkMast.setWrkSts(2L); // 工作状态: 2.设备上走
        wrkMast.setSourceStaNo(wrkMast.getStaNo()); // 源站
//        wrkMast.setStaNo(staNo + ""); // 目标站
//        if (wrkMast.getIoType() == 107) {
//            // 修改库位状态 Q.拣料/盘点/并板再入库
//            LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getSourceLocNo()));
//            if (Cools.isEmpty(locMast)) {
//                throw new CoolException("库位不存在:" + wrkMast.getLocNo());
//            }
//            locMastService.selectOne(new EntityWrapper<LocMast>()
//                            .eq("loc_sts", )
//                    .eq("whs_type", locMast.getWhsType()));
//
//
//        } else {
//            //        wrkMast.setStaNo(staNo + ""); // 目标站
//            wrkMast.setLocNo(wrkMast.getSourceLocNo()); // 目标库位 = 出库时的源库位
//            wrkMast.setSourceLocNo(""); // 源库位清空
//        }
        //        wrkMast.setStaNo(staNo + ""); // 目标站
        wrkMast.setLocNo(wrkMast.getSourceLocNo()); // 目标库位 = 出库时的源库位
        wrkMast.setSourceLocNo(""); // 源库位清空
        wrkMast.setModiTime(now);