出入库调试

YYC

2023-06-15 a8da7c463224b9a5bc4628197afe4d9f7d05361c

 igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5207.java

@@ -20,6 +20,7 @@
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -42,7 +43,7 @@

    @Override
    public String getInterfaceId() {
        return Phone35Constant.API_PHONE_5205;
        return Phone35Constant.API_PHONE_5207;
    }

    @SuppressWarnings("unchecked")
@@ -56,23 +57,23 @@
            return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "参数有误，请重试！！");
        }
        //参数验证
        if (StringUtils.isEmpty(param.getDeptId())) {
            return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "参数有误，请重试！！");
        }
//        if (StringUtils.isEmpty(param.getDeptId())) {
//            return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "参数有误，请重试！！");
//        }

        //值仓提交前，再次确认当前流水是否为值仓流程
        InoutRecord record = hPhoneService.getInoutRecord(phone35AuthUser.getCompanyId(), phone35AuthUser.getDeptId(), param.getId(), null);
        if(!InoutConstant.PROGRESS_HANDLE.equals(record.getProgress())){
        if (!InoutConstant.PROGRESS_HANDLE.equals(record.getProgress())) {
            return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "该单子不在值仓状态，不能进行值仓提交！");
        }

        InoutData data = new InoutData();
        BeanUtils.copyProperties(record, data);
        if(param.getType().equals(Phone35Constant.PHONE_INOUT_START)){
        if (param.getType().equals(Phone35Constant.PHONE_INOUT_START)) {
            //值仓开始提交，只更新值仓开始时间
            String msg = inoutService.updateData(data);
            return PhoneRespUtil.success(null, req, msg);
        }else{
        } else {
            //值仓结束提交,需更新流程状态、值仓结束时间、值仓人、值仓扣重等
            data.setDeHandle(param.getDeHandle());
            data.setHandleUser(phone35AuthUser.getCname());