1. 托盘管理 2. 入库通知档导入功能 3. 工作档明细 新增来源单据类型及单据编号 4. 库存明细统计表 增加一栏ERP数量（需跟ERP确认接口实...

zyx

2024-08-01 ebf0db91e09be33fcbfe97ed5b91965dc2e61dfd

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

@@ -1,5 +1,6 @@
package com.zy.asrs.wms.task.handler;

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.asrs.common.wms.entity.*;
import com.zy.asrs.common.wms.service.*;
@@ -12,6 +13,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;

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

@@ -35,6 +37,8 @@
    private WaitPakinService waitPakinService;
    @Autowired
    private OrderDetlService orderDetlService;
    @Autowired
    private BasZpalletService basZpalletService;

    public ReturnT<String> start(WrkMast wrkMast) {
        // 99.入库完成
@@ -131,6 +135,7 @@
                        locMast.setIoTime(now);
                        locMast.setModiTime(now);
                        locMast.setPic(wrkMast.getPic());
                        locMast.setFullPlt(wrkMast.getFullPlt());
                        if (!locMastService.updateById(locMast)) {
                            exceptionHandle("全板入库 ===>> 修改库位状态失败；[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
                        }
@@ -386,6 +391,7 @@
            // 修改工作主档状态
            wrkMast.setWrkSts(200L);//200.库存更新完成
            wrkMast.setModiTime(now);
            savePicInZpallet(wrkMast.getBarcode(),wrkMast.getPic(),wrkMast.getHostId());
            if (!wrkMastService.updateById(wrkMast)) {
                exceptionHandle("更新出库完成状态失败;[workNo={0}]", wrkMast.getWrkNo());
            }
@@ -398,4 +404,55 @@
        return SUCCESS;
    }

    /*
    保存图片到托盘管理页面
     */
    private void savePicInZpallet(String barcode, String pic, Long hostId){

        if(Cools.isEmpty(pic)){
            return;
        }

        BasZpallet basZpallet = basZpalletService.getOne(new LambdaQueryWrapper<BasZpallet>().eq(BasZpallet::getZpallet, barcode));
        List<String> list = null;
        if(Cools.isEmpty(basZpallet)){
            basZpallet = new BasZpallet();
            basZpallet.setHostId(hostId);
            basZpallet.setCreateTime(new Date());
            basZpallet.setModifyTime(new Date());

            list = new ArrayList<>();
            list.add(pic);
            basZpallet.setPicture(JSON.toJSONString(list));

            basZpalletService.save(basZpallet);

        }else {
            basZpallet.setHostId(hostId);
            basZpallet.setModifyTime(new Date());

            String picture = basZpallet.getPicture();
            list = JSON.parseArray(picture, String.class);
            if(list.size() >= 5){
                list.remove(0);
            }
            list.add(pic);

            basZpallet.setPicture(JSON.toJSONString(list));

            basZpalletService.updateById(basZpallet);
        }

    }

    public static void main(String[] args) {
        String str = "['abc','bcd','cdg']";
        List<String> list = JSON.parseArray(str, String.class);
        System.out.println(list);
        list.remove(0);
        System.out.println(list);
        list.add("aaa");
        System.out.println(list);
    }

}