diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java index 75e254ecf..0436cd5dc 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java @@ -8,7 +8,7 @@ public interface ModuleNameConstant { /** * 如果不需要 "" */ - public static final String DEVAUTH =""; + public static final String DEVAUTH ="-zhy"; /** * 工厂对接服务名称 diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseMaterialVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseMaterialVO.java new file mode 100644 index 000000000..cc25ec903 --- /dev/null +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseMaterialVO.java @@ -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; + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java index 137054917..1d0b4d8df 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java @@ -130,7 +130,8 @@ public class BasicdataDriverArteryController extends BladeController { } String phone = basicdataDriverArtery.getPhone(); - R userR = userClient.userInfoByPhone(AuthUtil.getUser().getTenantId(), phone); + R userR = userClient + .userInfoByPhone(AuthUtil.getUser().getTenantId(), phone); if (Func.isNotEmpty(userR.getData())){ User user = userR.getData(); basicdataDriverArtery.setUserId(user.getId()); diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java index 7b1fb17e9..ce73c0112 100644 --- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java +++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java @@ -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; } } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTaskApiController.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTaskApiController.java index 972e2ef7d..0f3bbff83 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTaskApiController.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTaskApiController.java @@ -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> allocationList(TaskSearchDTO taskSearchDTO, Query query) { - IPage 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 list = taskQuestService.selectallocationList(taskSearchDTO); + return R.data(list); } /** @@ -179,8 +193,8 @@ public class WarehouseTaskApiController { Map 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 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 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 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,"系统异常，联系管理员"); + } + } } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/TaskSearchDTO.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/TaskSearchDTO.java index 5b192387f..424966e3d 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/TaskSearchDTO.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/TaskSearchDTO.java @@ -99,5 +99,7 @@ public class TaskSearchDTO { private QuestDetailDTO questDetail; + private String materialCode; + } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.java index ea5213ba5..ce4076f87 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.java @@ -55,7 +55,7 @@ public interface TaskQuestMapper extends BaseMapper { List selectTaskQuestApiPage(IPage page,@Param("param") TaskQuestApiVO taskQuest,@Param("collect") List collect); - List selectallocationList(IPage page,@Param("param") TaskSearchDTO taskSearchDTO,@Param("collect") List collect); + List selectallocationList(@Param("param") TaskSearchDTO taskSearchDTO); List selectcontractList(IPage page, @Param("param") TaskSearchDTO taskSearchDTO,@Param("collect") List collect); @@ -77,6 +77,8 @@ public interface TaskQuestMapper extends BaseMapper { */ List selectZeroOrderTratInfo(@Param("stockArticleId") Long id,@Param("warehouseId") Long warehouseId); + List findMaterialList(@Param("param") TaskSearchDTO taskSearchDTO); + IPage selectStripListByQuestId(IPage page,@Param("questId") Long id); IPage selectInventoryListByQuestId(IPage page,@Param("questId") Long id); diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml index 99f9ddb34..b70003474 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml @@ -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 - 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} - - and lqd.warehouse_id in - - #{item} - - - - and lqd.position_code like concat('%',#{param.code},'%') - - - and lqd.allocation_id = #{param.code} - + and lqd.quest_type =2 + and lqd.is_deleted =0 + and lqd.quest_id = #{param.questId} + and lqd.warehouse_id = #{param.warehouseId} - GROUP BY lqd.allocation_id + GROUP BY lqd.allocation_id,lqd.position_code select id,tray_code AS palletCode From logpm_warehouse_tray_goods WHERE association_type = '1' AND association_id = #{stockArticleId} and warehouse_id =#{warehouseId} + +