java_project
/
logisticsplatform-service
4
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

1.库位盘点逻辑修改 

2.盘点任务公共功能提交
3.同步订单到新系统逻辑修改
training
zhenghaoyu 1 year ago
parent
d1518b6187
commit
023eae8c0b
11 changed files with 172 additions and 73 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java
  2. 14
      blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseMaterialVO.java
  3. 3
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java
  4. 19
      blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java
  5. 49
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTaskApiController.java
  6. 2
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/TaskSearchDTO.java
  7. 4
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.java
  8. 35
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml
  9. 8
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.xml
  10. 5
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/ITaskQuestService.java
  11. 104
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java

2
blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java
Unescape View File

@ -8,7 +8,7 @@ public interface ModuleNameConstant {
/**
* 如果不需要 ""
*/
public static final String DEVAUTH ="";
public static final String DEVAUTH ="-zhy";
/**
* 工厂对接服务名称

14
blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseMaterialVO.java
Unescape View File

@ -0,0 +1,14 @@
package com.logpm.warehouse.vo;
import lombok.Data;
import java.io.Serializable;
@Data
public class WarehouseMaterialVO implements Serializable {
private String materialCode;
private String materialName;
}

3
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java
Unescape View File

@ -130,7 +130,8 @@ public class BasicdataDriverArteryController extends BladeController {
}
String phone = basicdataDriverArtery.getPhone();
R<User> userR = userClient.userInfoByPhone(AuthUtil.getUser().getTenantId(), phone);
R<User> userR = userClient
.userInfoByPhone(AuthUtil.getUser().getTenantId(), phone);
if (Func.isNotEmpty(userR.getData())){
User user = userR.getData();
basicdataDriverArtery.setUserId(user.getId());

19
blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java
Unescape View File

@ -599,9 +599,6 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService {
distributionStockArticleEntity.setAdvanceId(advanceId);
//--------------2023-07-06 新增字段处理
//存入运单信息
saveWaybillEntity(wayBillNo);
// 增加订单 经销商信息 和门店信息
buildDealerAndStore(distributionStockArticleEntity, advanceEntity);
@ -662,6 +659,7 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService {
Integer status = orderDetailEntity.getStatus();
Integer carsType = orderDetailEntity.getCarsType();
Integer signState = orderDetailEntity.getSignState();
waybillNo = orderDetailEntity.getWaybillNo();
DistributionParcelListEntityVO vo = advanceDetailClient.getByUnitNoAndWarehouseId(unitNo,oldWarehouseId);
DistributionParcelListEntity entity = new DistributionParcelListEntity();
@ -727,6 +725,16 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService {
log.warn("#################handleDataToPlatform: 保存包件信息失败 orderCode={}", entity.getOrderCode());
throw new CustomerException(405, "保存包件信息失败");
}
//存入运单信息
WarehouseWaybillEntity waybillEntity = saveWaybillEntity(waybillNo);
if(!Objects.isNull(waybillEntity)){
distributionStockArticleEntity.getW
}
}
}
@ -770,11 +778,11 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService {
}
private void saveWaybillEntity(String waybillNo) {
private WarehouseWaybillEntity saveWaybillEntity(String waybillNo) {
log.info("#################handleDataToPlatform.saveWaybillEntity: {}", waybillNo);
if (StringUtil.isBlank(waybillNo)) {
return;
return null;
}
//通过运单号先去查询新系统是否存在这个运单号
WarehouseWaybillEntity warehouseWaybill = warehouseWaybillClient.findByWaybillNo(waybillNo);
@ -869,5 +877,6 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService {
warehouseWaybillClient.updateEntity(warehouseWaybill);
}
return warehouseWaybill;
}
}

49
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTaskApiController.java
Unescape View File

@ -12,6 +12,7 @@ import com.logpm.warehouse.service.ITaskQuestService;
import com.logpm.warehouse.vo.TaskContractVO;
import com.logpm.warehouse.vo.TaskQuestApiVO;
import com.logpm.warehouse.vo.TaskallocationVO;
import com.logpm.warehouse.vo.WarehouseMaterialVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
@ -54,9 +55,22 @@ public class WarehouseTaskApiController {
@GetMapping("/allocationList")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "库位列表", notes = "code,type")
public R<IPage<TaskallocationVO>> allocationList(TaskSearchDTO taskSearchDTO, Query query) {
IPage<TaskallocationVO> pages = taskQuestService.selectallocationList(Condition.getPage(query), taskSearchDTO);
return R.data(pages);
public R allocationList(TaskSearchDTO taskSearchDTO) {
Long questId = taskSearchDTO.getQuestId();//任务id
if(Objects.isNull(questId)){
log.warn("###############allocationList: 任务id为空 questId={}",questId);
return R.fail(403,"任务id为空");
}
BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
if (Func.isEmpty(myCurrentWarehouse)){
log.warn("###############allocationList: 仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse);
return R.fail(403,"仓库信息为空");
}
taskSearchDTO.setWarehouseId(myCurrentWarehouse.getId());
List<TaskallocationVO> list = taskQuestService.selectallocationList(taskSearchDTO);
return R.data(list);
}
/**
@ -179,8 +193,8 @@ public class WarehouseTaskApiController {
Map<String,Object> map = new HashMap<>();
map.put("allocationCode",allocationCode);
map.put("allNUm",allNUm);
map.put("finishNUm",finishNUm);
map.put("allNum",allNUm);
map.put("finishNum",finishNUm);
map.put("list",list);
return R.data(map);
}catch (CustomerException e){
@ -240,8 +254,8 @@ public class WarehouseTaskApiController {
Map<String,Object> map = new HashMap<>();
map.put("allocationCode",allocationCode);
map.put("allNUm",allNUm);
map.put("finishNUm",finishNUm);
map.put("allNum",allNUm);
map.put("finishNum",finishNUm);
map.put("list",list);
return R.data(map);
}catch (CustomerException e){
@ -300,8 +314,8 @@ public class WarehouseTaskApiController {
Map<String,Object> map = new HashMap<>();
map.put("allocationCode",allocationCode);
map.put("allNUm",allNUm);
map.put("finishNUm",finishNUm);
map.put("allNum",allNUm);
map.put("finishNum",finishNUm);
map.put("list",list);
return R.data(map);
}catch (CustomerException e){
@ -482,6 +496,23 @@ public class WarehouseTaskApiController {
}
@PostMapping("/findMaterialList")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "查询物料集合", notes = "code,type")
public R findMaterialList(@RequestBody TaskSearchDTO taskSearchDTO) {
String method = "###########findMaterialList: ";
log.info(method+"查询物料集合 参数：{}",taskSearchDTO);
try{
List<WarehouseMaterialVO> list = taskQuestService.findMaterialList(taskSearchDTO);
return R.data(list);
}catch (CustomerException e){
log.warn(e.message);
return R.fail(e.code,e.message);
}catch (Exception e){
log.error(method+"系统异常，联系管理员",e);
return R.fail(500,"系统异常，联系管理员");
}
}
}

2
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/TaskSearchDTO.java
Unescape View File

@ -99,5 +99,7 @@ public class TaskSearchDTO {
private QuestDetailDTO questDetail;
private String materialCode;
}

4
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.java
Unescape View File

@ -55,7 +55,7 @@ public interface TaskQuestMapper extends BaseMapper<TaskQuestEntity> {
List<TaskQuestApiVO> selectTaskQuestApiPage(IPage<TaskQuestApiVO> page,@Param("param") TaskQuestApiVO taskQuest,@Param("collect") List<Long> collect);
List<TaskallocationVO> selectallocationList(IPage<TaskallocationVO> page,@Param("param") TaskSearchDTO taskSearchDTO,@Param("collect") List<Long> collect);
List<TaskallocationVO> selectallocationList(@Param("param") TaskSearchDTO taskSearchDTO);
List<TaskContractVO> selectcontractList(IPage<TaskContractVO> page, @Param("param") TaskSearchDTO taskSearchDTO,@Param("collect") List<Long> collect);
@ -77,6 +77,8 @@ public interface TaskQuestMapper extends BaseMapper<TaskQuestEntity> {
*/
List<WarehouseTrayEntity> selectZeroOrderTratInfo(@Param("stockArticleId") Long id,@Param("warehouseId") Long warehouseId);
List<WarehouseMaterialVO> findMaterialList(@Param("param") TaskSearchDTO taskSearchDTO);
IPage<QuestDetailVO> selectStripListByQuestId(IPage<TaskQuestVO> page,@Param("questId") Long id);
IPage<QuestDetailVO> selectInventoryListByQuestId(IPage<TaskQuestVO> page,@Param("questId") Long id);

35
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml
Unescape View File

@ -65,25 +65,17 @@
SELECT
lqd.allocation_id allocationId,
lqd.position_code positionCode,
sum(lqd.stock_num) unTotal
sum( lqd.stock_num ) total ,
sum( If(lqd.quest_status = 1,lqd.stock_num,0) ) unTotal
FROM
logpm_quest_detail lqd
<where>
lqd.quest_type =2 and lqd.is_deleted =0 and (lqd.quest_status = 0 or lqd.quest_status = 1) and lqd.quest_id = #{param.questId}
<if test="collect != null and @org.apache.commons.collections4.CollectionUtils@isNotEmpty(collect)">
and lqd.warehouse_id in
<foreach collection="collect" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
</if>
<if test="param.code != null and param.code != '' and param.type ==1 ">
and lqd.position_code like concat('%',#{param.code},'%')
</if>
<if test="param.code != null and param.code != '' and param.type ==2 ">
and lqd.allocation_id = #{param.code}
</if>
and lqd.quest_type =2
and lqd.is_deleted =0
and lqd.quest_id = #{param.questId}
and lqd.warehouse_id = #{param.warehouseId}
</where>
GROUP BY lqd.allocation_id
GROUP BY lqd.allocation_id,lqd.position_code
</select>
<select id="selectcontractList" resultType="com.logpm.warehouse.vo.TaskContractVO">
SELECT
@ -139,6 +131,19 @@
<select id="selectZeroOrderTratInfo" resultType="com.logpm.warehouse.entity.WarehouseTrayEntity">
select id,tray_code AS palletCode From logpm_warehouse_tray_goods WHERE association_type = '1' AND association_id = #{stockArticleId} and warehouse_id =#{warehouseId}
</select>
<select id="findMaterialList" resultType="com.logpm.warehouse.vo.WarehouseMaterialVO">
select lbm.product_code,
lbm.`name`
from logpm_basicdata_material lbm
where lbm.is_deleted = 0
<if test="param.materialCode != null and param.materialCode != '' ">
and (lbm.product_code like concat('%',#{materialCode},'%') or lbm.`name` like concat('%',#{materialCode},'%'))
</if>
</select>
<select id="selectStripListByQuestId" resultType="com.logpm.warehouse.vo.QuestDetailVO">
SELECT
lqd.*,

8
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.xml
Unescape View File

@ -302,14 +302,14 @@
ldpl.stock_article_id orderId,
2 questType,
1 questTarget,
ldpl.order_package_code orderPackageCode,
ldpl.order_package_code ordePackageCode,
ldpl.id orderPackageId,
0 questStatus,
ldpl.quantity stockNum,
ldpl.warehouse_id warehouseId,
lwug.position_code positionCode,
lwta.tray_id trayId,
lwt.tray_code trayCode,
lwt.pallet_code trayCode,
lwug.allocation_id allocationId,
0 isNew
from logpm_warehouse_updown_goods lwug
@ -339,7 +339,7 @@
ldsa.warehouse_id warehouseId,
lwug.position_code positionCode,
lwta.tray_id trayId,
lwt.tray_code trayCode,
lwt.pallet_code trayCode,
lwug.allocation_id allocationId,
0 isNew
from logpm_warehouse_updown_goods lwug
@ -369,7 +369,7 @@
ldsl.warehouse_id warehouseId,
lwug.position_code positionCode,
lwta.tray_id trayId,
lwt.tray_code trayCode,
lwt.pallet_code trayCode,
lwug.allocation_id allocationId,
ldsl.cargo_number materialCode,
ldsl.market_name marketName,

5
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/ITaskQuestService.java
Unescape View File

@ -64,7 +64,7 @@ public interface ITaskQuestService extends BaseService<TaskQuestEntity> {
IPage<TaskQuestApiVO> selectTaskQuestApiPage(IPage<TaskQuestApiVO> page, TaskQuestApiVO taskQuest);
IPage<TaskallocationVO> selectallocationList(IPage<TaskallocationVO> page, TaskSearchDTO taskSearchDTO);
List<TaskallocationVO> selectallocationList(TaskSearchDTO taskSearchDTO);
IPage<TaskContractVO> selectcontractList(IPage<TaskContractVO> page, TaskSearchDTO taskSearchDTO);
@ -104,6 +104,9 @@ public interface ITaskQuestService extends BaseService<TaskQuestEntity> {
R trayListInfo(IPage<Object> page, TaskSearchDTO taskSearchDTO);
void saveNewQuestDetail(TaskSearchDTO taskSearchDTO);
List<WarehouseMaterialVO> findMaterialList(TaskSearchDTO taskSearchDTO);
IPage <QuestDetailVO> SelectStrip(IPage<TaskQuestVO> page,Long id);
IPage <QuestDetailVO> SelectInventory(IPage<TaskQuestVO> page,Long id);

104
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java
Unescape View File

@ -16,11 +16,10 @@
*/
package com.logpm.warehouse.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.logpm.basicdata.entity.*;
import com.logpm.basicdata.feign.*;
@ -58,7 +57,6 @@ import org.springframework.transaction.annotation.Transactional;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Function;
import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;
@ -211,18 +209,16 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
}
@Override
public IPage<TaskallocationVO> selectallocationList(IPage<TaskallocationVO> page, TaskSearchDTO taskSearchDTO) {
List<Long> collect = this.getmyWarehouseList();
baseMapper.setSqlMode();
List<TaskallocationVO> list = baseMapper.selectallocationList(page, taskSearchDTO, collect);
if (!list.isEmpty()) {
for (TaskallocationVO taskallocationVO : list) {
Long allocationId = taskallocationVO.getAllocationId();
Integer i = warehouseUpdownGoodsMapper.selectCountSumByallocation(allocationId);
taskallocationVO.setTotal(i);
}
}
return page.setRecords(list);
public List<TaskallocationVO> selectallocationList(TaskSearchDTO taskSearchDTO) {
List<TaskallocationVO> list = baseMapper.selectallocationList(taskSearchDTO);
// if (!list.isEmpty()) {
// for (TaskallocationVO taskallocationVO : list) {
// Long allocationId = taskallocationVO.getAllocationId();
// Integer i = warehouseUpdownGoodsMapper.selectCountSumByallocation(allocationId);
// taskallocationVO.setTotal(i);
// }
// }
return list;
}
@Override
@ -465,7 +461,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
* @return
*/
@Transactional(rollbackFor = Exception.class)
private int getTaskInventory(Long taskId,Long warehouseId,BasicdataTrayEntity trayByTrayCode){
public int getTaskInventory(Long taskId,Long warehouseId,BasicdataTrayEntity trayByTrayCode){
//查询是否在当前任务内
List<TaskQuestChildEntity> list = taskQuestChildService.list(Wrappers.<TaskQuestChildEntity>query().lambda()
.eq(TaskQuestChildEntity::getQuestId, taskId)
@ -647,6 +643,17 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
//先判定盘点任务是否已结束
verifyTask(questId,warehouseId);
//先判断库位是否有数据
List<QuestDetailEntity> lsPackage = warehouseUpdownGoodsMapper.allocationDetailByPackage(taskSearchDTO);
List<QuestDetailEntity> lsZero = warehouseUpdownGoodsMapper.allocationDetailByZero(taskSearchDTO);
List<QuestDetailEntity> lsStock = warehouseUpdownGoodsMapper.allocationDetailByStock(taskSearchDTO);
Integer size = lsPackage.size() + lsZero.size() + lsStock.size();
if(size == 0){
log.warn("###########allocationDetailByPackage: 未有数据在盘点计划中 questId={}",questId);
throw new CustomerException(403,"未有数据在盘点计划中");
}
//先查询任务的过滤商场
QueryWrapper<TaskQuestChildEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("quest_id",questId)
@ -678,10 +685,10 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
//查询货位上的所有包条
//然后存入detail表
List<QuestDetailEntity> list = warehouseUpdownGoodsMapper.allocationDetailByPackage(taskSearchDTO);
if(list.isEmpty()){
log.warn("###########allocationDetailByPackage: 未有数据在盘点计划中 questId={}",questId);
throw new CustomerException(403,"未有数据在盘点计划中");
}
// if(list.isEmpty()){
// log.warn("###########allocationDetailByPackage: 未有数据在盘点计划中 questId={}",questId);
// throw new CustomerException(403,"未有数据在盘点计划中");
// }
questDetailService.saveList(list,questId);
@ -728,10 +735,10 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
//查询货位上的所有包条
//然后存入detail表
List<QuestDetailEntity> list = warehouseUpdownGoodsMapper.allocationDetailByZero(taskSearchDTO);
if(list.isEmpty()){
log.warn("###########allocationDetailByZero: 未有数据在盘点计划中 questId={}",questId);
throw new CustomerException(403,"未有数据在盘点计划中");
}
// if(list.isEmpty()){
// log.warn("###########allocationDetailByZero: 未有数据在盘点计划中 questId={}",questId);
// throw new CustomerException(403,"未有数据在盘点计划中");
// }
questDetailService.saveList(list,questId);
return list;
@ -777,10 +784,10 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
//查询货位上的所有包条
//然后存入detail表
List<QuestDetailEntity> list = warehouseUpdownGoodsMapper.allocationDetailByStock(taskSearchDTO);
if(list.isEmpty()){
log.warn("###########allocationDetailByStock: 未有数据在盘点计划中 questId={}",questId);
throw new CustomerException(403,"未有数据在盘点计划中");
}
// if(list.isEmpty()){
// log.warn("###########allocationDetailByStock: 未有数据在盘点计划中 questId={}",questId);
// throw new CustomerException(403,"未有数据在盘点计划中");
// }
questDetailService.saveList(list,questId);
return list;
@ -800,8 +807,8 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
Long questDetaiId = questDetailDTO.getId();//明细id
QuestDetailEntity detailEntity = questDetailService.getById(questDetaiId);
if(Objects.isNull(detailEntity)){
log.warn("###########updateQuestSetail: 存在不在盘点计划中的数据 questDetaiId={}",questDetaiId);
throw new CustomerException(403,"存在不在盘点计划中的数据");
log.warn("###########updateQuestSetail: 盘点明细不存在 questDetaiId={}",questDetaiId);
throw new CustomerException(403,"盘点明细不存在");
}
Integer stockNum = questDetailDTO.getStockNum();
Integer lossNum = questDetailDTO.getLossNum();
@ -816,7 +823,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
childList.add(addQuestDetailChild(noRepairNum,"40",questDetaiId,warehouseId));
childList.add(addQuestDetailChild(deliveNum,"50",questDetaiId,warehouseId));
childList.add(addQuestDetailChild(noReceivedNum,"60",questDetaiId,warehouseId));
questDetailChildService.saveBatch(childList);
questDetailChildService.saveOrUpdateBatch(childList);
detailEntity.setQuestStatus(1);
questDetailService.updateById(detailEntity);
}
@ -1027,6 +1034,11 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
questDetailService.save(questDetailEntity);
}
@Override
public List<WarehouseMaterialVO> findMaterialList(TaskSearchDTO taskSearchDTO) {
return baseMapper.findMaterialList(taskSearchDTO);
}
@Override
public IPage<QuestDetailVO> SelectStrip(IPage<TaskQuestVO> page,Long id) {
IPage<QuestDetailVO> questDetailVOList = baseMapper.selectStripListByQuestId(page,id);
@ -1047,11 +1059,31 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
private QuestDetailChildEntity addQuestDetailChild(Integer num,String cargoName,Long questDetaiId,Long warehouseId){
QuestDetailChildEntity questDetailChildEntity = new QuestDetailChildEntity();
questDetailChildEntity.setQuestDetailId(questDetaiId);
questDetailChildEntity.setCargoName(cargoName);
questDetailChildEntity.setQuestNum(num);
questDetailChildEntity.setWarehouseId(warehouseId);
if(Objects.isNull(questDetaiId)){
log.warn("###########addQuestDetailChild: 明细id不存在 questDetaiId={}",questDetaiId);
throw new CustomerException(403,"明细id不存在");
}
if(Objects.isNull(num)){
log.warn("###########addQuestDetailChild: 数量不正确 num={}",num);
throw new CustomerException(403,"数量不正确");
}
QueryWrapper<QuestDetailChildEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("quest_detail_id",questDetaiId)
.eq("cargo_name",cargoName)
.eq("is_deleted",0);
QuestDetailChildEntity questDetailChildEntity = questDetailChildService.getOne(queryWrapper);
if(Objects.isNull(questDetailChildEntity)){
questDetailChildEntity = new QuestDetailChildEntity();
questDetailChildEntity.setQuestDetailId(questDetaiId);
questDetailChildEntity.setCargoName(cargoName);
questDetailChildEntity.setQuestNum(num);
questDetailChildEntity.setWarehouseId(warehouseId);
}else{
questDetailChildEntity.setQuestNum(num);
}
return questDetailChildEntity;
}

Write Preview
Loading…
Cancel
Save