yangjun
/
nursing_unit_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

服务指令-退货流程，开始结束增加返回map

This commit is contained in:
曹磊 2025-12-24 10:48:08 +08:00
parent a2cc34903e
commit 59cbc8da3d
2 changed files with 67 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingOrdersApi.java
View File

@ -3,6 +3,8 @@ package com.nu.modules.invoicing.api;
import com.nu.entity.InvoicingOrdersEntity;
import org.jeecg.common.api.vo.Result;
import java.util.Map;
/**
* @Description: 仓库类服务指令工单主表
* @Author: zmy
@ -93,13 +95,13 @@ public interface IInvoicingOrdersApi {
* 单元退货-库管点击开始
* @param invoicingOrdersEntity
*/
void beginDyThOrder(InvoicingOrdersEntity invoicingOrdersEntity);
Map<String,String> beginDyThOrder(InvoicingOrdersEntity invoicingOrdersEntity);
/**
* 单元退货-库管点击完成
* @param invoicingOrdersEntity
*/
void finishDyThOrder(InvoicingOrdersEntity invoicingOrdersEntity);
Map<String,String> finishDyThOrder(InvoicingOrdersEntity invoicingOrdersEntity);
/**
* 流程中提交时修改业务单号

87
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/impl/InvoicingOrdersServiceImpl.java
View File

@ -291,17 +291,34 @@ public class InvoicingOrdersServiceImpl extends ServiceImpl<InvoicingOrdersMappe
* @param invoicingOrdersEntity
*/
@Override
public void beginDyThOrder(InvoicingOrdersEntity invoicingOrdersEntity){
public Map<String,String> beginDyThOrder(InvoicingOrdersEntity invoicingOrdersEntity){
log.info("Id:"+invoicingOrdersEntity.getId());
log.info("UpdateBy:"+invoicingOrdersEntity.getInitiatorId());
Calendar c = Calendar.getInstance();
InvoicingOrders entity = new InvoicingOrders();
entity.setBeginTime(c.getTime());
entity.setIzStart("Y");
entity.setUpdateEmp(invoicingOrdersEntity.getInitiatorId());
entity.setUpdateTime(c.getTime());
entity.setId(invoicingOrdersEntity.getId());
baseMapper.updateById(entity);
Map<String,String> map = new HashMap();
map.put("error_code","0");
map.put("msg","开始成功");
InvoicingOrders io = new InvoicingOrders();
BeanUtils.copyProperties(invoicingOrdersEntity, io);
InvoicingOrders invoicingOrders = baseMapper.getOrderOne(io);
if(invoicingOrders!=null){
if(invoicingOrders.getIzStart().equals("N")){
Calendar c = Calendar.getInstance();
InvoicingOrders entity = new InvoicingOrders();
entity.setBeginTime(c.getTime());
entity.setIzStart("Y");
entity.setUpdateEmp(invoicingOrdersEntity.getInitiatorId());
entity.setUpdateTime(c.getTime());
entity.setId(invoicingOrdersEntity.getId());
baseMapper.updateById(entity);
}else{
map.put("error_code","1");
map.put("msg","工单已开始");
}
}else{
map.put("error_code","1");
map.put("msg","此工单不存在");
}
return map;
}
/**
@ -309,23 +326,45 @@ public class InvoicingOrdersServiceImpl extends ServiceImpl<InvoicingOrdersMappe
* @param invoicingOrdersEntity
*/
@Override
public void finishDyThOrder(InvoicingOrdersEntity invoicingOrdersEntity){
public Map<String,String> finishDyThOrder(InvoicingOrdersEntity invoicingOrdersEntity){
log.info("Id:"+invoicingOrdersEntity.getId());
log.info("UpdateBy:"+invoicingOrdersEntity.getInitiatorId());
Calendar c = Calendar.getInstance();
QueryWrapper<InvoicingOrders> ioQw = new QueryWrapper<>();
ioQw.eq("id", invoicingOrdersEntity.getId());
InvoicingOrders order = this.getOne(ioQw);
InvoicingOrders DirectivePrice = baseMapper.getDirectivePrice(order.getDirectiveId());//获取服务指令价格
InvoicingOrders entity = new InvoicingOrders();
entity.setId(order.getId());
entity.setFinishTime(c.getTime());
entity.setIzFinish("Y");
entity.setUpdateEmp(invoicingOrdersEntity.getInitiatorId());
entity.setUpdateTime(c.getTime());
entity.setTollPrice(DirectivePrice.getTollPrice());
entity.setComPrice(DirectivePrice.getComPrice());
baseMapper.updateById(entity);
Map<String,String> map = new HashMap();
map.put("error_code","0");
map.put("msg","结束成功");
InvoicingOrders io = new InvoicingOrders();
BeanUtils.copyProperties(invoicingOrdersEntity, io);
InvoicingOrders invoicingOrders = baseMapper.getOrderOne(io);
if(invoicingOrders!=null){
if(invoicingOrders.getIzStart().equals("Y")){
if(invoicingOrders.getIzFinish().equals("N")){
Calendar c = Calendar.getInstance();
QueryWrapper<InvoicingOrders> ioQw = new QueryWrapper<>();
ioQw.eq("id", invoicingOrdersEntity.getId());
InvoicingOrders order = this.getOne(ioQw);
InvoicingOrders DirectivePrice = baseMapper.getDirectivePrice(order.getDirectiveId());//获取服务指令价格
InvoicingOrders entity = new InvoicingOrders();
entity.setId(order.getId());
entity.setFinishTime(c.getTime());
entity.setIzFinish("Y");
entity.setUpdateEmp(invoicingOrdersEntity.getInitiatorId());
entity.setUpdateTime(c.getTime());
entity.setTollPrice(DirectivePrice.getTollPrice());
entity.setComPrice(DirectivePrice.getComPrice());
baseMapper.updateById(entity);
}else{
map.put("error_code","1");
map.put("msg","工单已结束");
}
}else{
map.put("error_code","1");
map.put("msg","工单未开始");
}
}else{
map.put("error_code","1");
map.put("msg","此工单不存在");
}
return map;
}
@Override