#

zjj

2024-08-09 9216c1580be254037fed688882d90d87365f4f01

#

 src/main/java/com/zy/asrs/entity/result/KeyValueVo.java

@@ -11,5 +11,11 @@
    private String name;

    private Object value;
    public KeyValueVo() {
    }

    public KeyValueVo(String name, Object value) {
        this.name = name;
        this.value = value;
    }
}

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

@@ -6,6 +6,7 @@
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;

import java.util.Date;
import java.util.List;

@Mapper
@@ -25,4 +26,6 @@
    List<WrkDetl> selectPakoutQuery(@Param("staNo")Integer staNo, @Param("matnr")String matnr);

    List<WrkDetl> selectAndLogByOrderNoGroupByMatnrOfSum(String orderNo);

    int updateIoTimeWms(@Param("workNo") Integer workNo, @Param("ioTime") Date ioTime);
}

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

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.WrkMast;
import org.apache.ibatis.annotations.Insert;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -23,4 +24,6 @@

    List<WrkMast> selectWrkMastWrkDetlMatnrBatch(@Param("ioType") Integer ioType, @Param("matnr") String matnr , @Param("batch") String batch , @Param("grade") String grade , @Param("crnNo") Integer crnNo);

    @Insert("insert into asr_wrk_mast_log select * from asr_wrk_mast where wrk_no=#{workNo}")
    int saveWrkMastLog(Integer workNo);
}

 src/main/java/com/zy/asrs/service/WrkDetlService.java

@@ -23,4 +23,5 @@

    List<WrkDetl> selectAndLogByOrderNoGroupByMatnrOfSum(String orderNo);

    boolean updateIoTimeWms(Integer workNo, Date ioTime);
}

 src/main/java/com/zy/asrs/service/WrkMastService.java

@@ -26,4 +26,6 @@

    List<WrkMast> selectWrkMastWrkDetlMatnrBatch(Integer ioType,String matnr , String batch ,String grade,Integer crnNo);

    int saveWrkMastLog(Integer wrkNo);

}

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

@@ -55,9 +55,9 @@
            if(station.getLoading()==null || !station.getLoading().equals("Y")) {
                throw new CoolException(devpNo+"站点无物");
            }
            if(station.getWrkNo()!=null && station.getWrkNo()>0 && station.getWrkNo() < 9990) {
                throw new CoolException(devpNo+"站点已有工作号");
            }
//            if(station.getWrkNo()!=null && station.getWrkNo()>0 && station.getWrkNo() < 9990) {
//                throw new CoolException(devpNo+"站点已有工作号");
//            }
//            if(!station.getInEnable().equals("Y")) {
//                throw new CoolException(devpNo+"站点不是可入状态");
//            }

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

@@ -84,4 +84,8 @@
    public List<WrkDetl> selectAndLogByOrderNoGroupByMatnrOfSum(String orderNo) {
        return this.baseMapper.selectAndLogByOrderNoGroupByMatnrOfSum(orderNo);
    }
    @Override
    public boolean updateIoTimeWms(Integer workNo, Date ioTime) {
        return this.baseMapper.updateIoTimeWms(workNo, ioTime) > 0;
    }
}

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

@@ -54,4 +54,9 @@
    public List<WrkMast> selectWrkMastWrkDetlMatnrBatch(Integer ioType,String matnr , String batch ,String grade ,Integer crnNo) {
        return this.baseMapper.selectWrkMastWrkDetlMatnrBatch(ioType,matnr,batch,grade,crnNo);
    }

    @Override
    public int saveWrkMastLog(Integer workNo){
        return this.baseMapper.saveWrkMastLog(workNo);
    };
}

 src/main/java/com/zy/common/web/WcsController.java

@@ -7,6 +7,7 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.EmptyPlateOutParam;
import com.zy.asrs.entity.result.KeyValueVo;
import com.zy.asrs.service.*;
import com.zy.common.CodeRes;
import com.zy.common.model.LocTypeDto;
@@ -49,6 +50,156 @@
    private RowLastnoService rowLastnoService;
    @Autowired
    private WorkService workService;
    @Autowired
    private StaDescService staDescService;

    @PostMapping("/pakin2/loc/v1")
    @ResponseBody
    @Transactional
    public synchronized R getLocNo2(@RequestBody SearchLocParam param) {
        if (Cools.isEmpty(param.getIoType())) {
            return R.error("入出库类型不能为空");
        }
        if (Cools.isEmpty(param.getSourceStaNo())) {
            return R.error("源站编号不能为空");
        }
        if (Cools.isEmpty(param.getBarcode())) {
            return R.error("条码不能为空");
        }
        // 源站点状态检测
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), false);
        sourceStaNo.setLocType1(param.getLocType1());
        LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);

        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
                .eq("barcode", param.getBarcode())
                .eq("io_type", 107)
                .eq("wrk_sts",14));
        StartupDto dto = new StartupDto();

        if (Cools.isEmpty(wrkMast)){
            try{
                log.info("/pakin2/loc/v1:"+dto + "======托盘码:"+param.getBarcode()+"此笔工作档未查询到盘点出库任务，开始查询盘点在入库任务==》");
                WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
                        .eq("barcode", param.getBarcode())
                        .eq("io_type", 57)
                        .eq("wrk_sts",2));
                if (Cools.isEmpty(wrkMast1)){
                    return R.error("未查询到工作档===》托盘码:"+param.getBarcode());
                }
                // 获取目标站
                Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
                        .eq("type_no", 57)
                        .eq("stn_no", sourceStaNo.getDevNo())
                        .eq("crn_no", wrkMast1.getCrnNo());
                StaDesc staDesc = staDescService.selectOne(wrapper);
                if (Cools.isEmpty(staDesc)) {
                    log.error("type_no={},stn_no={},crn_no={}", 57, sourceStaNo, wrkMast1.getCrnNo());
                    throw new CoolException("入库路径不存在");
                }
                if (!staDesc.getCrnStn().equals(wrkMast1.getStaNo())){
                    throw new CoolException("堆垛机作业站点与工作号目标站点不一致！！！请联系工程师修改"+
                            "\\n堆垛机号："+wrkMast1.getCrnNo()+
                            "\\n堆垛机站点："+staDesc.getCrnStn()+
                            "\\n工作号："+wrkMast1.getWrkNo()+
                            "\\n工作档目标站点："+wrkMast1.getStaNo());
                }
                dto.setWorkNo(wrkMast1.getWrkNo());
                dto.setCrnNo(wrkMast1.getCrnNo());
                dto.setLocNo(wrkMast1.getLocNo());
                dto.setStaNo(wrkMast1.getStaNo());
                dto.setSourceStaNo(wrkMast1.getSourceStaNo());
                log.info("/pakin2/loc/v1:"+dto + "======托盘码:"+param.getBarcode()+"此笔工作档已经是盘点再入库状态，返回wcs下发信息");
                return R.ok().add(dto);
            }catch (Exception e){
                log.error("/pakin2/loc/v1:======托盘码:"+param.getBarcode()+"盘点回库查询工作档出错======>"+e);
                return R.error("查看wms==>info==>error");
            }
        }
        List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()));
        if (Cools.isEmpty(locDetls) || locDetls.size()<1){
            return R.error("托盘码:"+param.getBarcode()+",未查到库存明细");
        }else {
            if (!locDetls.get(0).getLocNo().equals(wrkMast.getSourceLocNo())){
                return R.error("明细已经被修改,故障");
            }
        }

        Date now = new Date();
        if (param.getIoType() == 107) {//盘点再入库
            try{
                // 检索库位
                List<KeyValueVo> list = locDetls.stream().map(item -> new KeyValueVo(item.getMatnr(), item.getBatch())).distinct().collect(Collectors.toList());
                try{
//                    dto = commonService.getLocNo(1, 57, param.getSourceStaNo(), list, locTypeDto, 0);
                    dto= commonService.getLocNo(1, param.getSourceStaNo(), locDetls.get(0).getMatnr(),locDetls.get(0).getBatch() ,null,locTypeDto);
                }catch (Exception e){
                    log.error("堆垛机站盘点再入库查询库位出错:"+e.getMessage()+e);
                    return R.error("e.getMessage()");
//                    throw new Exception("查询库位出错，参数：param.getSourceStaNo():"+param.getSourceStaNo()+"==>list:"+list+"==>locTypeDto:"+locTypeDto);
                }
                LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", dto.getLocNo()));
                if (Cools.isEmpty(locMast) || Cools.isEmpty(locMast.getLocSts())){
                    throw new Exception("目标库位locMast查询为空||locMast.getLocSts为空");
                }else {
                    if (!locMast.getLocSts().equals("O")){
                        throw new Exception("目标库位！locMast.getLocSts.equals(“O”)"+locMast.getLocSts());
                    }else {
                        locMast.setLocSts("Q");
                        locMast.setBarcode(param.getBarcode());
                        if (!locMastService.updateById(locMast)) {
                            log.error(" /pakin2/loc/v1 --- 修改库位状态失败！" + locMast.getLocNo());
                            throw new Exception("修改库位状态失败");
                        }
                    }
                }
                if (!locDetlService.updateLocNo(locMast.getLocNo(),wrkMast.getSourceLocNo())){
                    log.error(" /pakin2/loc/v1 --- 库存明细转移失败！" + wrkMast.getWrkNo());
                    throw new Exception("库存明细转移失败");
                }
                // 修改源库位状态 O 空库位
                LocMast locMast2 = locMastService.selectById(wrkMast.getSourceLocNo());
                locMast2.setLocSts("O");
                locMast2.setBarcode("");
                locMast2.setModiTime(now);
                if (!locMastService.updateById(locMast2)) {
                    log.error(" /pakin2/loc/v1 --- 修改源库位状态失败！" + wrkMast.getSourceLocNo());
                    throw new Exception("修改源库位状态失败");
                }

                try{
                    // 保存工作主档历史档
                    if (wrkMastService.saveWrkMastLog(wrkMast.getWrkNo())==0) {
                        log.error(" stnToCrnStnPick2 --- 保存工作主档历史档失败！" + wrkMast.getWrkNo());
                    }
                    // 更新工作档数据状态
                    wrkMast.setIoTime(now);
                    wrkMast.setIoType(wrkMast.getIoType() - 50); // 入出库类型: 107->57
                    wrkMast.setWrkSts(2L); // 工作状态: 2.设备上走
                    wrkMast.setSourceStaNo(param.getSourceStaNo()); // 源站
                    wrkMast.setStaNo(dto.getStaNo()); // 目标站
                    wrkMast.setModiTime(now);
                    wrkMast.setLocNo(dto.getLocNo());
                    wrkMast.setCrnNo(dto.getCrnNo());
                    if (!wrkMastService.updateById(wrkMast)) {
                        log.error(" stnToCrnStnPick --- 更新工作档数据状态失败！" + wrkMast.getWrkNo());
                        throw new CoolException("更新工作档数据状态失败");
                    }
                    // 更新明细档io_time (历史档关联使用）
                    wrkDetlService.updateIoTimeWms(wrkMast.getWrkNo(),now);
                }catch (Exception e){
                    throw new CoolException("更新工作档数据状态出错");
                }
            }catch (Exception e){
                log.error("/pakin2/loc/v1:======托盘码:"+param.getBarcode()+"盘点回库出错======>"+e);
                return R.error("查看wmsError");
            }
        } else {
            return R.error();
        }
        log.info("/pakin2/loc/v1:"+dto + "======托盘码:"+param.getBarcode());
        return R.ok().add(dto);
    }

    @PostMapping("/pakin/loc/v1")
    @ResponseBody

 src/main/resources/mapper/WrkDetlMapper.xml

@@ -95,6 +95,12 @@
        and matnr = #{matnr}
        <include refid="batchSeq"></include>
    </update>
    <update id="updateIoTimeWms">
        update asr_wrk_detl
        set io_time = #{ioTime}
        where 1=1
          and wrk_no = #{workNo}
    </update>

    <select id="selectPakoutQuery" resultMap="BaseResultMap">
        select