#

zjj

2 天以前 606e903e80fa9a7e77c72879494b47fbd195b93a

#

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

@@ -70,6 +70,18 @@
//
//
//    }
@RequestMapping("/agv/staBind")
@ManagerAuth(memo = "AGV站点绑定物料")
public R pdaAgvStaBind(@RequestBody CombParam combParam){
    if (Cools.isEmpty(combParam.getBarcode(), combParam.getCombMats())) {
        throw new CoolException(BaseRes.PARAM);
    }

    mobileService.AgvStaBind(combParam,getUserId());

    return R.ok();

}
    @PostMapping("/agv/lineCall")
    @ManagerAuth
    public R pdaAgvLineCall(@RequestBody Map<String,Object> map){

 src/main/java/com/zy/asrs/entity/AgvSite.java

@@ -1,5 +1,6 @@
package com.zy.asrs.entity;

import com.baomidou.mybatisplus.enums.FieldStrategy;
import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.annotations.TableField;
@@ -29,9 +30,15 @@
    private String area;

    @ApiModelProperty(value= "")
    @TableField("work_no")
    @TableField(strategy = FieldStrategy.IGNORED, value = "work_no")
    private Integer workNo;

    /**
     * 1.占用
     * 0.空闲
     * 2.预约
     */

    @ApiModelProperty(value= "")
    private Integer status;


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

@@ -66,4 +66,6 @@
    R siteList();

    R lineCall(Map<String, Object> map);

    void AgvStaBind(CombParam combParam,Long userID);
}

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

@@ -87,6 +87,59 @@
    @Autowired
    private AgvSiteService agvSiteService;



    @Override
    @Transactional(rollbackFor = Exception.class)
    public void AgvStaBind(CombParam param,Long userId) {
        AgvSite agvSite = agvSiteService.selectOne(new EntityWrapper<AgvSite>().eq("name", param.getBarcode()));
        if (Cools.isEmpty(agvSite)){
            throw new CoolException("未找到AGV暂存位信息");
        }
        if (agvSite.getStatus() != 0){
            throw new CoolException("AGV暂存位状态不为空闲");
        }

        int workNo = commonService.getWorkNo(1);
        Date now = new Date();
        WrkMast wrkMast1 = new WrkMast();
        wrkMast1.setWrkNo(workNo);
        wrkMast1.setWrkSts(2L);
        wrkMast1.setIoType(300);
        wrkMast1.setIoTime(now);
        wrkMast1.setIoPri(13D); // 优先级：13
        wrkMast1.setFullPlt("Y"); // 满板：Y
        wrkMast1.setPicking("N"); // 拣料
        wrkMast1.setExitMk("N"); // 退出
        wrkMast1.setEmptyMk("N"); // 空板
        wrkMast1.setLinkMis("N");
        wrkMast1.setAppeUser(userId); // 操作人员数据
        wrkMast1.setAppeTime(now);
        wrkMast1.setModiUser(userId);
        wrkMast1.setModiTime(now);
        wrkMast1.setBarcode(param.getBarcode());
        if (!wrkMastService.insert(wrkMast1)) {
            throw new CoolException("保存工作档失败");
        }
        // 生成工作档明细
        param.getCombMats().forEach(waitPakin -> {
            WrkDetl wrkDetl = new WrkDetl();
            wrkDetl.sync(waitPakin);
            wrkDetl.setWrkNo(workNo);
            wrkDetl.setIoTime(now);
            wrkDetl.setAppeTime(now);
            wrkDetl.setModiTime(now);
            if (!wrkDetlService.insert(wrkDetl)) {
                throw new CoolException("保存工作明细失败");
            }
        });

        agvSite.setWorkNo(workNo);
        agvSite.setStatus(1);
        agvSiteService.updateById(agvSite);

    }

    @Override
    public R inLocCallAgv(String sta, String inSta) {

@@ -1280,7 +1333,7 @@

    @Override
    public R siteList() {
        List<AgvSite> agvSites = agvSiteService.selectList(new EntityWrapper<AgvSite>().eq("status", 1));
        List<AgvSite> agvSites = agvSiteService.selectList(new EntityWrapper<AgvSite>());
        ArrayList<AgvSiteListVo> agvSiteListVos = new ArrayList<>();
        for (AgvSite agvSite : agvSites) {
            AgvSiteListVo agvSiteListVo = new AgvSiteListVo();
@@ -1335,6 +1388,7 @@
        return R.ok();
    }


    public void uploadErp(InventoryErpParam param){
        String response = "";
        boolean success = false;

 src/main/java/com/zy/common/properties/SystemProperties.java

@@ -64,7 +64,7 @@

    // 生成激活码
    public static void main(String[] args) {
        String timeStr = "2021-08-01 17:48:35";
        String timeStr = "2026-08-08 08:00:00";
        Date exprTime = DateUtils.convert(timeStr);
        String code = AesUtils.encrypt(DateUtils.convert(exprTime, DateUtils.yyyyMMddHHmmss), SystemProperties.SALT);
        System.out.println("激活码："+code);