调整退货单-结束服务方法参数
This commit is contained in:
parent
bde0c1d30d
commit
6bc52fcf26
|
|
@ -31,6 +31,7 @@ import com.nu.modules.warehouseMaterialInfo.entity.BlWarehouseMaterialInfo;
|
|||
import com.nu.modules.warehouseMaterialInfo.service.IBlWarehouseMaterialInfoService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.compress.utils.Lists;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.apache.shiro.SecurityUtils;
|
||||
import org.jeecg.common.system.api.ISysBaseAPI;
|
||||
import org.jeecg.common.system.vo.LoginUser;
|
||||
|
|
@ -138,7 +139,7 @@ public class ThdServiceImpl implements ITuiHuoApi {
|
|||
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||
InvoicingOrdersEntity orderEntity = new InvoicingOrdersEntity();
|
||||
orderEntity.setFlowCode("dyth_cksh");//指令流程flow_code 看接口有标明
|
||||
orderEntity.setPoolId(dto.getId());//退货主表id 入库时会根据更新为对应退货单号(入库时才生成的退货单号)
|
||||
orderEntity.setId(dto.getId());//退货主表id 入库时会根据更新为对应退货单号(入库时才生成的退货单号)
|
||||
orderEntity.setInitiatorId(sysUser.getEmployessId());//员工id
|
||||
invoicingOrdersApi.beginDyThOrder(orderEntity);
|
||||
|
||||
|
|
@ -539,15 +540,25 @@ public class ThdServiceImpl implements ITuiHuoApi {
|
|||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public boolean finishDirectiveServe(InvoicingThdMainEntity dto) {
|
||||
InvoicingOrdersEntity p_ = new InvoicingOrdersEntity();
|
||||
p_.setId(dto.getId());
|
||||
InvoicingOrdersEntity v_ = invoicingOrdersApi.getDyThOrderInfo(p_);
|
||||
if(v_ == null || StringUtils.isBlank(v_.getPoolId())){
|
||||
return false;
|
||||
}
|
||||
|
||||
String mainId = v_.getPoolId();//退货单id
|
||||
//查询当前状态
|
||||
QueryWrapper<NuInvoicingThdMain> qw = new QueryWrapper<>();
|
||||
qw.eq("id", dto.getId());
|
||||
qw.eq("id", mainId);
|
||||
NuInvoicingThdMain main = thdMainMapper.selectOne(qw);
|
||||
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||
|
||||
// if(main == null || "")
|
||||
|
||||
InvoicingOrdersEntity orderEntity = new InvoicingOrdersEntity();
|
||||
orderEntity.setFlowCode("dyth_cksh");//指令流程flow_code 看接口有标明
|
||||
orderEntity.setPoolId(dto.getId());//退货主表id 入库时会根据更新为对应退货单号(入库时才生成的退货单号)
|
||||
orderEntity.setId(dto.getId());//退货指令的id
|
||||
orderEntity.setBizId(main.getThdNo());
|
||||
orderEntity.setInitiatorId(sysUser.getEmployessId());//员工id
|
||||
invoicingOrdersApi.finishDyThOrder(orderEntity);
|
||||
|
|
|
|||
Loading…
Reference in New Issue