本次:
1、请领单(回退单)-再次提交成功后返回最新单子信息 上次: 1、长者入住主表记录入住时间 2、pad接口-退货单-退货指令列表查询 3、pad接口-退货单-护理单元物料库存查询 4、pad接口-退货单-退货车添加物料 5、请领单pad接口 post操作类接口增加日志@AutoLog 6、pad接口-移除请领车物料入参调整:改为根据nuid+elderid+wlid移除 7、pad接口-请领单作废、回退、出库、确认收货成功时返回单据最新数据
This commit is contained in:
parent
9646b1a45f
commit
438faa71a1
|
|
@ -39,6 +39,7 @@ import org.jeecg.common.system.api.ISysBaseAPI;
|
||||||
import org.jeecg.common.system.vo.LoginUser;
|
import org.jeecg.common.system.vo.LoginUser;
|
||||||
import org.springframework.beans.BeanUtils;
|
import org.springframework.beans.BeanUtils;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.context.annotation.Lazy;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
import org.springframework.util.CollectionUtils;
|
import org.springframework.util.CollectionUtils;
|
||||||
|
|
@ -95,6 +96,9 @@ public class QingLingServiceImpl implements IQinglingApi {
|
||||||
private IBlWarehouseMaterialInfoService warehouseMaterialInfoService;
|
private IBlWarehouseMaterialInfoService warehouseMaterialInfoService;
|
||||||
@Autowired
|
@Autowired
|
||||||
private INuWarehouseMaterialCrkInfoService warehouseMaterialCrkInfoService;
|
private INuWarehouseMaterialCrkInfoService warehouseMaterialCrkInfoService;
|
||||||
|
@Lazy
|
||||||
|
@Autowired
|
||||||
|
private QingLingServiceImpl ownService;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<Map<String, Object>> getMaterialTreeData(MaterialCategoryEntity materialCategoryEntity) {
|
public List<Map<String, Object>> getMaterialTreeData(MaterialCategoryEntity materialCategoryEntity) {
|
||||||
|
|
@ -293,7 +297,8 @@ public class QingLingServiceImpl implements IQinglingApi {
|
||||||
invoicingQldMainService.updateById(one);
|
invoicingQldMainService.updateById(one);
|
||||||
|
|
||||||
result.put("status", "success");
|
result.put("status", "success");
|
||||||
return null;
|
result.put("result",ownService.queryQldByQldNo(dto.getQldNo()));
|
||||||
|
return result;
|
||||||
} else {
|
} else {
|
||||||
//购物车-提交
|
//购物车-提交
|
||||||
//当前购物车信息
|
//当前购物车信息
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue