船运问题

YYC

2023-10-31 8728429603cdb25b5fc6245915dc829e78d81571

 igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager2.java

@@ -15,6 +15,7 @@
import com.ld.igds.inout.dto.InoutParam;
import com.ld.igds.inout.dto.InoutRecordItemData;
import com.ld.igds.inout.dto.InoutRecordItemParam;
import com.ld.igds.inout.mapper.InoutRecordMapper;
import com.ld.igds.inout.service.InoutRecordItemService;
import com.ld.igds.inout.service.InoutService;
import com.ld.igds.m.dto.NoticeParam;
@@ -28,6 +29,7 @@
import com.ld.igds.util.DateUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
@@ -59,6 +61,8 @@
    private InoutCommonService inoutManagerService;
    @Resource
    private HInoutCarConfService carConfService;
    @Autowired
    private InoutRecordMapper inoutMapper;

    /**
     * 出入库流程中的实时数据，直接从缓存中获取
@@ -226,6 +230,9 @@
        // 调用保存方法执行
        if (null == data.getIntelCard()) {
            data.setIntelCard(data.getUserId());
        }
        if (null == data.getRegisterTime()) {
            data.setRegisterTime(new Date());
        }
        msg = inoutService.insertData(data);

@@ -475,6 +482,12 @@
        if (InoutConstant.PROGRESS_RECORD.equals(data.getProgress())) {
            //说明流程已结束，重新统计数量
            inoutRecordItemService.updateNumByInoutItem(data.getRecordId());
            InoutParam param = new InoutParam();
            param.setId(data.getRecordId());
            param.setType(data.getType());
            param.setCompanyId(data.getCompanyId());
            InoutData completeData = inoutMapper.inoutQueryById(param);
            inoutService.updateInoutCache(completeData);
            return new PageResponse<>(RespCodeEnum.CODE_0000.getCode(), null, data);

        } else {
@@ -539,7 +552,6 @@
                data.setDepotId(item.getDepotId());
            }
            if (data.getDepotId().equals(item.getDepotId())) {

                inoutParam.setId(data.getRecordId());
            } else {
                String newId = data.getRecordId() + temp;
@@ -573,11 +585,15 @@
            map.put(inoutParam.getId(), inoutParam);
        }
        InoutParam par;
        InoutData dat;
        for (String key : map.keySet()) {
            par = map.get(key);
            if (par != null) {
                dat = new InoutData();
                //更新流水数据(包含重量信息以及流程进度信息)
                inoutService.toComplete(par);
                BeanUtils.copyProperties(par, dat);
                inoutService.updateData(dat);

//                //更新仓库库存
//                if (InoutConstant.TYPE_IN.equals(par.getType())) {
@@ -591,7 +607,8 @@
//                }
            }
        }

        InoutData completeData = inoutMapper.inoutQueryById(inoutParam);
        inoutService.updateInoutCache(completeData);
        return new PageResponse<>(RespCodeEnum.CODE_0000.getCode(), null, data);
    }

@@ -637,7 +654,6 @@
            param.setCompanyId(user.getCompanyId());
        }
        param.setDeptId(ContextUtil.subDeptId(user));

        param.setCompleteStatus(InoutConstant.COMPLETE_STATUS_NONE);

        List<InoutNoticeIn> list = inoutManagerService.listNoticeIn(param);
@@ -671,8 +687,8 @@

        //获取仓库信息
        List<Depot> depotList = coreCommonService.getCacheDepotList(param.getCompanyId(), param.getDeptId());
        Map<String,String> map = new HashMap<>();
        if(depotList != null && depotList.size() > 0){
        Map<String, String> map = new HashMap<>();
        if (depotList != null && depotList.size() > 0) {
            for (Depot depot : depotList) {
                map.put(depot.getId(), depot.getName());
            }
@@ -680,7 +696,7 @@

        //赋值仓库名称
        for (InoutNoticeOut inoutNoticeOut : list) {
            if(map.get(inoutNoticeOut.getDepotId()) != null){
            if (map.get(inoutNoticeOut.getDepotId()) != null) {
                inoutNoticeOut.setDepotName(map.get(inoutNoticeOut.getDepotId()));
            }
        }