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

Merge branch 'dev' into pre-production

newStockUp
pref_mail@163.com 1 year ago
parent
162a3611f0 eac07015e7
commit
5b4e37911e
32 changed files with 777 additions and 318 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. 6
      blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataTrayClient.java
  2. 7
      blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/QuestDetailEntity.java
  3. 5
      blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/QuestContrastVO.java
  4. 14
      blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/QuestDetailVO.java
  5. 5
      blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TaskTrayVO.java
  6. 2
      blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseRetentionRecordVO.java
  7. 9
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataTrayClient.java
  8. 4
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionDeliveryAppController.java
  9. 117
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java
  10. 10
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/bean/Resp.java
  11. 8
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java
  12. 42
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml
  13. 12
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml
  14. 6
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockupService.java
  15. 1
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DisStockOrdercodeRecoServiceImpl.java
  16. 148
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
  17. 9
      blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/IOuPaiFactoryService.java
  18. 35
      blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryDataServiceImpl.java
  19. 67
      blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java
  20. 33
      blade-service/logpm-factory/src/main/java/com/logpm/factory/props/OldSystemProperties.java
  21. 279
      blade-service/logpm-factory/src/test/java/com/logpm/factory/TestService.java
  22. 2
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/TaskQuestController.java
  23. 2
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseGoodsAllocationClient.java
  24. 7
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml
  25. 7
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.java
  26. 35
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.xml
  27. 7
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseGoodsAllocationService.java
  28. 126
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java
  29. 6
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseGoodsAllocationServiceImpl.java
  30. 56
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseRetentionRecordServiceImpl.java
  31. 8
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java
  32. 20
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/wrapper/TaskQuestVOWrapper.java

6
blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataTrayClient.java
Unescape View File

@ -41,6 +41,7 @@ public interface IBasicdataTrayClient {
String API_PREFIX = "tray/client";
String TOP = API_PREFIX + "/top";
String GETTRAYENTITY = API_PREFIX + "/getTrayEntity";
String GETTRAYENTITYLIST = API_PREFIX + "/getTrayEntityList";
/**
* 获取托盘列表
@ -64,4 +65,9 @@ public interface IBasicdataTrayClient {
@GetMapping(GETTRAYENTITY)
List<BasicdataTrayEntity> getTrayEntityList(@RequestParam("trayId") String trayId);
//查询全部托盘信息
@GetMapping(GETTRAYENTITYLIST)
List<BasicdataTrayEntity> getTrayEntityList();
}

7
blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/QuestDetailEntity.java
Unescape View File

@ -169,6 +169,13 @@ public class QuestDetailEntity extends TenantEntity {
@ApiModelProperty(value = "托盘码")
private String trayCode;
/**
* 托盘名称
*/
@ApiModelProperty(value = "托盘码")
@TableField(exist = false)
private String trayName;
/**
* 上架后的库位ID
*/

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

@ -80,6 +80,11 @@ public class QuestContrastVO {
*/
private String trayCode;
/**
* 托盘名称
*/
private String trayName;
private String trayId;
private String positionCode;

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

@ -23,6 +23,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.List;
@ -158,4 +159,17 @@ public class QuestDetailVO extends QuestDetailEntity {
private String consigneeMobile;
/**
* 盘点人
*/
@ApiModelProperty(value = "盘点人")
private String inventoryPerson;
/**
* 盘点时间
*/
@ApiModelProperty(value = "盘点时间")
private Date inventoryDate;
}

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

@ -14,6 +14,11 @@ public class TaskTrayVO {
*/
@ApiModelProperty(value = "托盘码")
private String trayCode;
/**
* 托盘名称
*/
@ApiModelProperty(value = "托盘名称")
private String trayName;
/**
* 托盘Id

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

@ -40,6 +40,8 @@ public class WarehouseRetentionRecordVO extends WarehouseRetentionRecordEntity {
private String retentionTypeName;
private Integer retentionTotal;
private List<DistributionReservationEntity> reservationEntityList;
private DistributionDeliveryListVO deliveryListVO;

9
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataTrayClient.java
Unescape View File

@ -92,4 +92,13 @@ public class BasicdataTrayClient implements IBasicdataTrayClient {
);
}
/**
* 查询全部托盘数据
* @return
*/
@Override
public List<BasicdataTrayEntity> getTrayEntityList() {
return basicdataTrayService.list();
}
}

4
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionDeliveryAppController.java
Unescape View File

@ -272,8 +272,8 @@ public class DistributionDeliveryAppController {
@ApiOperationSupport(order = 11)
public R retentionScan(@Valid @RequestBody DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
R r = distributionDeliveryListService.retentionScan(distrilbutionloadingscanDTO);
return r;
}
return r;
}
/**

117
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java
Unescape View File

@ -24,8 +24,11 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.logpm.basicdata.entity.BasicdataTrayEntity;
import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
import com.logpm.basicdata.feign.IBasicdataGoodsAreaClient;
import com.logpm.basicdata.feign.IBasicdataTrayClient;
import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
import com.logpm.distribution.bean.Res;
import com.logpm.distribution.bean.Resp;
import com.logpm.distribution.config.RedissonConfig;
@ -34,6 +37,7 @@ import com.logpm.distribution.dto.app.StockConfigOrderPackageListVO;
import com.logpm.distribution.dto.app.StockupDTO;
import com.logpm.distribution.dto.app.StockupZeroDTO;
import com.logpm.distribution.entity.*;
import com.logpm.distribution.mapper.DistributionReservationMapper;
import com.logpm.distribution.mapper.DistributionReservationStocklistMapper;
import com.logpm.distribution.service.*;
import com.logpm.distribution.vo.*;
@ -48,8 +52,11 @@ import org.jetbrains.annotations.Nullable;
import org.redisson.api.RLock;
import org.springblade.common.constant.DictBizConstant;
import org.springblade.common.constant.RabbitConstant;
import org.springblade.common.constant.orderpackage.OrderPackageFreezeStatusConstant;
import org.springblade.common.constant.orderpackage.OrderPackageStatusConstant;
import org.springblade.common.constant.pda.PdaAudioLingoStatus;
import org.springblade.common.constant.reservation.ReservationOrderStatusConstant;
import org.springblade.common.constant.reservation.ReservationPackageStatusConstant;
import org.springblade.common.constant.stockup.StockupStatusConstant;
import org.springblade.common.constant.stockup.StockupTypeStatusConstant;
import org.springblade.common.utils.CommonUtil;
@ -103,6 +110,9 @@ public class DistributionStockupAppController extends BladeController {
private final IWarehouseUpdownTypeClient warehouseUpdownTypeClient;
private final IDistributionAsyncService distributionAsyncService;
private final IDistributionDeliveryDetailsService distributionDeliveryDetailsService;
private final DistributionReservationMapper distributionReservationMapper;
private final IDisStockListDetailService disStockListDetailService;
private final IBasicdataWarehouseClient basicdataWarehouseClient;
private final RabbitTemplate rabbitTemplate;
private final BladeRedis bladeRedis;
@ -631,7 +641,11 @@ public class DistributionStockupAppController extends BladeController {
@ApiOperation(value = "备货扫描检查", notes = "传入stockupDTO")
public R stockupScanCheck(@RequestBody StockupDTO stockupDTO) {
Integer scanType = stockupDTO.getScanType();//扫码类型
BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
if (Func.isEmpty(myCurrentWarehouse)){
return R.data(403, "未授权！");
}
if (scanType == 2) {
//库存品扫描
Long stockListId = stockupDTO.getStockListId();
@ -640,13 +654,37 @@ public class DistributionStockupAppController extends BladeController {
Long stockupId = stockupDTO.getStockupId();//备货任务ID
Long reservationId = stockupDTO.getReservationId();//预约单id
// 通过包件查询包件表判断是否为库存品
DistributionParcelListEntity distributionParcelListEntity = distributionParcelListService.getOne(Wrappers.<DistributionParcelListEntity>query().lambda()
.eq(DistributionParcelListEntity::getOrderPackageCode, stockupDTO.getPacketBarCode())
.eq(DistributionParcelListEntity::getWarehouseId, myCurrentWarehouse.getId())
.eq(DistributionParcelListEntity::getOrderPackageFreezeStatus, OrderPackageFreezeStatusConstant.weidongjie.getValue())
);
if (Func.isEmpty(distributionParcelListEntity)){
//包件不存在
return Resp.scanFail(60004,"不是包件!!!","不是包件!!!","");
}
if (!distributionParcelListEntity.getConditions().equals(2)){
//不是库存品
return Resp.scanFail(60005,"此包件不是库存品!!!","此包件不是库存品!!!","");
}
String cargoNumber = stockupDTO.getCargoNumber();
if (!distributionParcelListEntity.getMaterialCode().equals(cargoNumber)){
//不属于该物料库存品包件
return Resp.scanFail(60006,"无效的库存品包件!!!","无效的库存品包件!!!","");
}
//判断是否可以继续备货
DistributionStockListEntity distributionStockListEntities = distributionStockupService.selectStockListInfoByCargoNumberList(stockupDTO.getReservationId(), stockupDTO.getCargoNumber(), stockupDTO.getAllocationId(), stockupDTO.getPacketBarCode());
if (ObjectUtils.isNull(distributionStockListEntities)) {
return R.data(60003, "", "该包件还不是库存品！");
return R.data(60003, "", "该包件还未上架！");
}
// 通过当前预约单和货物定位当前计划的库存品批次
@ -706,7 +744,7 @@ public class DistributionStockupAppController extends BladeController {
// 增加实际扫描的包件对应的库存品信息 增加在预约库存品中间表上
DistributionReservationStocklistEntity reservationStocklistEntity = new DistributionReservationStocklistEntity();
reservationStocklistEntity.setReservationId(stockupDTO.getReservationId());
reservationStocklistEntity.setReservationNum(0);
reservationStocklistEntity.setReservationNum(1);
reservationStocklistEntity.setLoadingStatus("10");
reservationStocklistEntity.setSigningStatus("10");
reservationStocklistEntity.setStockListStatus("3");
@ -716,10 +754,66 @@ public class DistributionStockupAppController extends BladeController {
reservationStocklistEntity.setUnit(stockListEntity.getCargoUnit());
reservationStocklistEntity.setRealityNum(0);
}
// 这里需要对原来的预约库存信息进行取消
distributionReservationStocklistService.save(reservationStocklistEntity);
// 默认 计划数量和实际数量为0
//扣减对应的库存品信息
DistributionStockListEntity newStockListEntity = distributionStockListService.getById(stockListEntity.getId());
newStockListEntity.setQuantityStock(newStockListEntity.getQuantityStock() - reservationStocklistEntity.getReservationNum());
distributionStockListService.updateById(newStockListEntity);
//查询该预约该物料的库存品信息
List<DistributionReservationStocklistEntity> reservationStocklistEntities = distributionReservationMapper.selectInventoryListByIdAndMateriel(reservationStocklistEntity.getId(),stockListEntity.getMarketCode());
//可能会出现同一物料不同批次的库存品
//根据情况进行计划的数量扣减
Map<Long, List<DistributionReservationStocklistEntity>> stockListMap;
if (Func.isNotEmpty(reservationStocklistEntities)){
//查询是否进行备货
stockListMap = reservationStocklistEntities.stream().collect(Collectors.groupingBy(DistributionReservationStocklistEntity::getStocklistId));
//过滤已经完成备货的预约库存品批次
stockListMap.forEach((k,v)->{
//查询该预约的库存品包件是否完成备货
v.forEach(o->{
//查询包件是否完成备货
List<DisStockListDetailEntity> stockListDetailEntities = disStockListDetailService.list(Wrappers.<DisStockListDetailEntity>query().lambda()
.eq(DisStockListDetailEntity::getReservationId, o.getReservationId())
.eq(DisStockListDetailEntity::getStockListId, o.getStocklistId())
.ne(DisStockListDetailEntity::getStockPackageStatus, ReservationPackageStatusConstant.quxiao.getValue())
);
boolean stockFlag = stockListDetailEntities.stream().allMatch(s -> Func.isNotEmpty(s.getStockPackageCode()));
if (stockFlag){
stockListMap.remove(k);
}
});
});
} else {
stockListMap = null;
}
//stockListMap此时剩下的都是满足进行修改的库存品,这里就需要去进行指定删除哪一个库存品，这里默认添加数量为一需要指定一个进行扣减，
if (Func.isNotEmpty(stockListMap)){
List<DistributionReservationStocklistEntity> distributionReservationStocklistEntities = stockListMap.get(0);
DistributionReservationStocklistEntity reservationStocklist = distributionReservationStocklistEntities.get(0);
reservationStocklist.setReservationNum(reservationStocklist.getReservationNum() - reservationStocklistEntity.getReservationNum());
if (reservationStocklist.getReservationNum() == 0){
reservationStocklist.setStockListStatus(ReservationOrderStatusConstant.quxiao.getValue());
}
//查询包件是否完成备货
List<DisStockListDetailEntity> stockListDetailEntities = disStockListDetailService.list(Wrappers.<DisStockListDetailEntity>query().lambda()
.eq(DisStockListDetailEntity::getReservationId, reservationStocklist.getReservationId())
.eq(DisStockListDetailEntity::getStockListId, reservationStocklist.getStocklistId())
.ne(DisStockListDetailEntity::getStockPackageStatus, ReservationPackageStatusConstant.quxiao.getValue())
);
//对指定库存品包件进行库存品ID修改
DisStockListDetailEntity disStockListDetailEntity = stockListDetailEntities.stream().filter(sd -> Func.isEmpty(sd.getStockPackageCode())).collect(Collectors.toList()).get(0);
disStockListDetailEntity.setStockListId(stockListEntity.getId());
disStockListDetailService.updateById(disStockListDetailEntity);
distributionReservationStocklistService.updateById(reservationStocklist);
//维护对应库存品的冻结数量
DistributionStockListEntity oldStockListEntity = distributionStockListService.getById(reservationStocklist.getStocklistId());
oldStockListEntity.setQuantityStock(oldStockListEntity.getQuantityStock() + reservationStocklistEntity.getReservationNum());
distributionStockListService.updateById(oldStockListEntity);
}
// 默认 计划数量和实际数量为0
return R.fail("操作成功");
@ -747,7 +841,7 @@ public class DistributionStockupAppController extends BladeController {
@ApiOperationSupport(order = 1)
@ApiOperation(value = "备货扫描", notes = "传入stockupDTO")
public R stockupScan(@RequestBody StockupDTO stockupDTO) {
Integer scanType = stockupDTO.getScanType();//扫码类型
Integer scanType = stockupDTO.getScanType();//扫码类型 1 包件 2库存品
//手动
// TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition);
// try{
@ -760,9 +854,11 @@ public class DistributionStockupAppController extends BladeController {
}
lock.lock(5, TimeUnit.SECONDS);
if (scanType == 1) {
//包件
return stockupScanByCustom(stockupDTO);
} else if (scanType == 2) {
//库存平
R fail = stockupScanByStock(stockupDTO);
if (fail != null) return fail;
@ -819,8 +915,10 @@ public class DistributionStockupAppController extends BladeController {
if (ObjectUtils.isNull(stockListId)) {
// 通过扫码的二维码 查询其对应的库存存信息
if (stockupDTO.getStockPrint() == 1) {
//1 原有包条
byId = distributionStockListService.selectStockInforByOrderPackageCode(stockupDTO.getPacketBarCode());
} else {
// 2打印处理的扫码
byId = disStockOrdercodeRecoService.selectStockOrdercodeRecoListByCode(stockupDTO.getPacketBarCode());
}
stockupDTO.setStockListId(byId.getId());
@ -881,7 +979,11 @@ public class DistributionStockupAppController extends BladeController {
return Resp.scanFail("当前货位没有该包件信息！！", "当前货位没有该包件信息！！");
}
}
//校验 修改库存品数据
R r1 = distributionStockupService.handlingPackages(stockupDTO);
if(r1.getCode() != 200){
Resp.scanFail(r1.getMsg(),r1.getMsg());
}
Integer i = distributionStockupService.selectPackagePrint(stockupDTO);
switch (i) {
case 1:
@ -951,6 +1053,7 @@ public class DistributionStockupAppController extends BladeController {
entity.setConditions("0");
entity.setType(2);
entity.setAllocationId(stockupDTO.getAllocationId());
entity.setOutboundType(stockupEntity.getTypeService());
distributionStockService.save(entity);
// dataSourceTransactionManager.commit(transactionStatus);//提交

10
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/bean/Resp.java
Unescape View File

@ -1,6 +1,7 @@
package com.logpm.distribution.bean;
import lombok.Data;
import org.apache.poi.ss.formula.functions.T;
import org.springblade.core.tool.api.R;
@Data
@ -24,4 +25,13 @@ public class Resp extends R {
return resp;
}
public static Resp scanFail(int code,String msg,String audio,Object data){
Resp resp = new Resp();
resp.setCode(code);
resp.setMsg(msg);
resp.setData(data);
resp.setAudio(audio);
return resp;
}
}

8
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java
Unescape View File

@ -315,4 +315,12 @@ public interface DistributionReservationMapper extends BaseMapper<DistributionRe
* @return
*/
List<DistributionReservationEntity> getRetentionReservationList(@Param("ids") List<String> reservationIds);
/**
* 查询预约客户下指定物料的库存品库存品信息
* @param id
* @param marketCode
* @return
*/
List<DistributionReservationStocklistEntity> selectInventoryListByIdAndMateriel(@Param("reservationId") Long id,@Param("cargoNumber") String marketCode);
}

42
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml
Unescape View File

@ -308,35 +308,13 @@
ldslNew.tray_name AS trayName,
ldslNew.unpack AS unpack,
ldslNew.source_type AS sourceType,
ldslNew.source_type,
count(ldss.id) AS realNum,
<!-- t.deliveryDetailsId AS deliveryDetailsId,-->
t.reservation_num as planNum,
CASE
WHEN ldslNew.source_type = '2' THEN
(
SELECT
group_concat(DISTINCT lwug.allocation_id) AS allocations
FROM
logpm_warehouse_updown_goods lwug
WHERE
lwug.association_id = ldslNew.material_id
)
WHEN ldslNew.source_type = '1' THEN
(
SELECT
group_concat(DISTINCT lwug.allocation_id) AS allocations
FROM
logpm_distribution_stock_list AS ldslnew
LEFT JOIN logpm_distribution_parcel_list ldpl ON ldpl.order_code = ldslnew.incoming_batch
AND ldpl.material_id = ldslnew.material_id
AND ldpl.conditions = '2'
LEFT JOIN logpm_warehouse_updown_goods lwug ON lwug.association_value = ldpl.order_package_code
WHERE
ldslnew.id = t.id
)
END AS allocations
select GROUP_CONCAT( DISTINCT (allocation_id)) from logpm_warehouse_updown_goods where association_value =ldslNew.cargo_number or association_value in (
SELECT order_package_code from logpm_distribution_parcel_list where conditions=2 and material_code=ldslNew.cargo_number)
) as allocations
FROM
(
SELECT
@ -1311,5 +1289,19 @@
#{item}
</foreach>
</select>
<select id="selectInventoryListByIdAndMateriel"
resultType="com.logpm.distribution.entity.DistributionReservationStocklistEntity">
SELECT
ldrs.*REPEAT
statement_list
UNTIL search_condition END REPEAT;
FROM
logpm_distribution_reservation AS ldr
LEFT JOIN logpm_distribution_reservation_stocklist AS ldrs ON ldr.id = ldrs.reservation_id
LEFT JOIN logpm_distribution_stock_list AS ldsl ON ldrs.stocklist_id = ldsl.id
WHERE
ldr.id = #{reservationId} AND ldsl.cargo_number = #{cargoNumber}
</select>
</mapper>

12
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml
Unescape View File

@ -96,16 +96,8 @@
<select id="getStockListInfo" resultType="com.logpm.distribution.vo.DistributionStockListVO">
select ldsl.market_name marketName,ldsl.incoming_batch incomingBatch,ldsl.quantity_stock quantityStock,ldsl.warehouse_id warehouseId,
ldsl.description_goods descriptionGoods,ldsl.cargo_number cargoNumber,ldsl.market_id marketId,ldsl.material_id materialId,
lwtg.tray_id trayId,
lwtg.tray_code trayCode,
lwug.allocation_id allocationId,
lwug.position_code positionCode,
ldsl.id id
from logpm_distribution_stock_list ldsl
LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldsl.material_id
and lwtg.incoming_batch = ldsl.incoming_batch and lwtg.market_id = ldsl.market_id
LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldsl.material_id
and lwug.incoming_batch = ldsl.incoming_batch and lwug.market_id = ldsl.market_id
<where>
ldsl.warehouse_id = #{par.warehouseId} and ldsl.quantity_stock > 0 and ldsl.source_type = 2
<if test="par.marketId != null and par.marketId != '' "> and ldsl.market_id = #{par.marketId} </if>
@ -382,6 +374,7 @@
<if test="param.materialId != null and param.materialId != '' "> and ldsi.material_id = #{param.materialId}</if>
<if test="param.marketId != null and param.marketId != '' "> and ldsi.market_id = #{param.marketId}</if>
<if test="param.warehouseId != null and param.warehouseId != '' "> and ldsi.warehouse_id = #{param.warehouseId}</if>
<if test="param.incomingBatch != null and param.incomingBatch != '' "> and ldsi.incoming_batch = #{param.incomingBatch}</if>
<if test="param.storeId != null and param.storeId != '' ">and ldsi.store_id = #{param.storeId} </if>
</where>
@ -452,6 +445,9 @@
<if test="par.incomingBatch != null and par.incomingBatch != ''">
and incoming_batch like concat('%',#{par.incomingBatch},'%')
</if>
<if test="par.orderCode != null and par.orderCode != ''">
and order_code like concat('%',#{par.orderCode},'%')
</if>
<if test="par.serviceNumber != null and par.serviceNumber != ''">
and service_number like concat('%',#{par.serviceNumber},'%')
</if>

6
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockupService.java
Unescape View File

@ -267,4 +267,10 @@ public interface IDistributionStockupService extends BaseService<DistributionSto
StockConfigInfoVO stockConfigList(StockupDTO stockupDTO);
/**
* 处理背货有包件库存品信息
* @param stockupDTO
*/
R handlingPackages(StockupDTO stockupDTO);
}

1
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DisStockOrdercodeRecoServiceImpl.java
Unescape View File

@ -63,6 +63,7 @@ public class DisStockOrdercodeRecoServiceImpl extends BaseServiceImpl<DisStockOr
public DistributionStockListEntity selectStockOrdercodeRecoListByCode(String packetBarCode) {
LambdaQueryWrapper<DisStockOrdercodeRecoEntity> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(DisStockOrdercodeRecoEntity::getCode, packetBarCode);
List<DisStockOrdercodeRecoEntity> disStockOrdercodeRecoEntities = baseMapper.selectList(lambdaQueryWrapper);
if(!disStockOrdercodeRecoEntities.isEmpty()){
DisStockOrdercodeRecoEntity disStockOrdercodeRecoEntity = disStockOrdercodeRecoEntities.get(0);

148
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
Unescape View File

@ -67,6 +67,7 @@ import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringUtil;
import org.springblade.system.cache.DictBizCache;
import org.springblade.system.entity.DictBiz;
@ -1184,20 +1185,24 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
if (distributionStockupStockListVO.getPlanNum().equals(distributionStockupStockListVO.getRealNum())) {
distributionStockupStockListVO.setCompleteStact(true);
}
// 查询货位信息
String[] ids = distributionStockupStockListVO.getAllocations().split(",");
if (Func.isNotEmpty(distributionStockupStockListVO.getAllocations())){
List<WarehouseGoodsAllocationEntity> allocationInforByIds = warehouseGoodsAllocationClient.getAllocationInforByIds(ids);
String[] ids = distributionStockupStockListVO.getAllocations().split(",");
List<WarehouseGoodsAllocationEntity> allocationInforByIds = warehouseGoodsAllocationClient.getAllocationInforByIds(ids);
for (WarehouseGoodsAllocationEntity allocationInforById : allocationInforByIds) {
if (distributionStockupStockListVO.getAllocationList() == null) {
distributionStockupStockListVO.setAllocationList(new ArrayList<>());
for (WarehouseGoodsAllocationEntity allocationInforById : allocationInforByIds) {
if (distributionStockupStockListVO.getAllocationList() == null) {
distributionStockupStockListVO.setAllocationList(new ArrayList<>());
}
Map<String, Object> map = new HashMap<>();
map.put("id", allocationInforById.getId());
map.put("name", allocationInforById.getQrCode());
distributionStockupStockListVO.getAllocationList().add(map);
}
Map<String, Object> map = new HashMap<>();
map.put("id", allocationInforById.getId());
map.put("name", allocationInforById.getQrCode());
distributionStockupStockListVO.getAllocationList().add(map);
}
// 查询货位信息
}
return list;
}
@ -2249,7 +2254,6 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
//不一样
return 10;
}
//绑定码
disStockListDetail.setStockPackageCode(stockupDTO.getPacketBarCode());
disStockListDetail.setId(list1.get(0).getId());
@ -2813,7 +2817,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
}
if (!incomingBatches.isEmpty()) {
if (!StringUtil.isBlank(incomingBatches)) {
LambdaQueryWrapper<DistributionStockListEntity> lambdaQueryWrapper = new LambdaQueryWrapper();
lambdaQueryWrapper.eq(DistributionStockListEntity::getIncomingBatch, incomingBatches);
lambdaQueryWrapper.eq(DistributionStockListEntity::getCargoNumber, cargoNumber);
@ -2915,4 +2919,124 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
return stockConfigInfoVO;
}
/**
* 处理背货有包件库存品信息
* @param stockupDTO
*/
@Override
public R handlingPackages(StockupDTO stockupDTO) {
//查询包件是不是属于该货位
WarehouseUpdownGoodsEntity warehouseUpdownGoods = new WarehouseUpdownGoodsEntity();
warehouseUpdownGoods.setAllocationId(stockupDTO.getAllocationId());
warehouseUpdownGoods.setAssociationType("3");
warehouseUpdownGoods.setAssociationValue(stockupDTO.getPacketBarCode());
warehouseUpdownGoods.setWarehouseId(stockupDTO.getWarehouseId());
List<WarehouseUpdownGoodsEntity> locationStockListInformation = warehouseUpdownGoodsClient.getLocationStockListInformation(warehouseUpdownGoods);
if(locationStockListInformation.isEmpty() || ObjectUtils.isNull(locationStockListInformation)){
//不是该货位库存品包件信息；
return R.fail("不是该货位库存品包件信息");
}
//查询属于那个批次的库存品
DistributionParcelListEntity byId = distributionParcelListService.getById(locationStockListInformation.get(0).getAssociationId());
if(ObjectUtils.isNull(byId)){
return R.fail("订单信息不存在！");
}
DistributionStockListEntity distributionStockListEntity = distributionStockListMapper.selectOne(Wrappers.<DistributionStockListEntity>query().lambda()
.eq(DistributionStockListEntity::getIncomingBatch, byId.getOrderCode())
.eq(DistributionStockListEntity::getWarehouseId,stockupDTO.getWarehouseId())
);
if(ObjectUtils.isNull(distributionStockListEntity)){
return R.fail("该包件不是库存品！");
}
//查询该预约的库存品信息
List<DistributionReservationStocklistEntity> list = distributionReservationStocklistService.list(Wrappers.<DistributionReservationStocklistEntity>query().lambda()
.eq(ObjectUtils.isNotNull(stockupDTO.getReservationId()), DistributionReservationStocklistEntity::getReservationId, stockupDTO.getReservationId())
.apply("stock_list_status in (1,3)")
);
if(ObjectUtils.isNull(list)){
return R.fail("没有需要备货的库存品信息！");
}
Optional<DistributionReservationStocklistEntity> first = list.stream().filter(i -> i.getStocklistId().equals(distributionStockListEntity.getId())).findFirst();
if(first.isPresent()){
//没有一样的库存品数据
return R.fail("没有一样的库存品数据");
}
//判断数量是否可以直接备货
DistributionReservationStocklistEntity reservationStocklistEntity1 = first.get();
if(reservationStocklistEntity1.getRealityNum() > reservationStocklistEntity1.getReservationNum()){
return R.success("可以直接备货！");
}
List<DistributionReservationStocklistEntity> keYi = new ArrayList<>(); //可以操作的库存品
//取出一样的库存品信息
list.forEach( i -> {
DistributionStockListEntity distributionStockListEntity1 = distributionStockListMapper.selectById(i.getStocklistId());
if(distributionStockListEntity1.getDescriptionGoods().equals(distributionStockListEntity.getDescriptionGoods())
&& distributionStockListEntity1.getCargoNumber().equals(distributionStockListEntity.getCargoNumber())
&& i.getRealityNum() > i.getReservationNum() ){
keYi.add(i);
}
});
if(keYi.isEmpty()){
return R.fail("没有可以操作的库存品数据");
}
//获取数据
List<Long> collect1 = keYi.stream().map(DistributionReservationStocklistEntity::getStocklistId).collect(Collectors.toList());
//查询早期的库存品数据
List<DistributionStockListEntity> distributionStockListEntities = distributionStockListMapper.selectList(Wrappers.<DistributionStockListEntity>query().lambda()
.in(DistributionStockListEntity::getId, collect1)
.orderByAsc(DistributionStockListEntity::getCreateTime)
);
//修改可以修改的库存平
Optional<DistributionReservationStocklistEntity> collect2 = keYi.stream().filter(i -> i.getStocklistId().equals(distributionStockListEntities.get(0).getId())).findFirst();
if(!collect2.isPresent()){
DistributionReservationStocklistEntity distributionReservationStocklistEntity = collect2.get();
Integer reservationNum = distributionReservationStocklistEntity.getReservationNum() - 1;
//减少其他一样的库存品数据
DistributionReservationStocklistEntity j = new DistributionReservationStocklistEntity();//减少
j.setId(distributionReservationStocklistEntity.getId());
j.setReservationNum(reservationNum);
distributionReservationStocklistService.updateById(j);
//修改待备货的数量
DistributionReservationStocklistEntity y = new DistributionReservationStocklistEntity();//要
y.setId(reservationStocklistEntity1.getId());
y.setReservationNum(reservationStocklistEntity1.getReservationNum()+1);
distributionReservationStocklistService.updateById(y);
//修改库存品备货记录表
List<DisStockListDetailEntity> list1 = disStockListDetailService.list(Wrappers.<DisStockListDetailEntity>query().lambda()
.eq(DisStockListDetailEntity::getReservationId, stockupDTO.getReservationId())
.eq(DisStockListDetailEntity::getStockListId, distributionReservationStocklistEntity.getStocklistId())
.isNull(DisStockListDetailEntity::getStockPackageCode)
);
if(list1.isEmpty()){
return R.fail("可用数据为空！");
}
//修改第一条数据
DisStockListDetailEntity disStockListDetail = new DisStockListDetailEntity();
disStockListDetail.setId(list1.get(0).getId());
disStockListDetail.setStockListId(reservationStocklistEntity1.getStocklistId());
disStockListDetailService.updateById(disStockListDetail);
//判断是否取消预约库存品数据
if(distributionReservationStocklistEntity.getRealityNum() == 0) {
if(reservationNum == 0){
//取消当前库存品预约数据
DistributionReservationStocklistEntity q = new DistributionReservationStocklistEntity();//取消
q.setId(distributionReservationStocklistEntity.getId());
q.setStockListStatus("2");
distributionReservationStocklistService.updateById(q);
}
}
//回复冻结数量
DistributionStockListEntity distributionStockList = new DistributionStockListEntity();
distributionStockList.setId(distributionReservationStocklistEntity.getStocklistId());
distributionStockList.setQuantityStock(distributionStockListEntity.getQuantityStock() + 1);
distributionStockList.setQuantityOccupied(distributionStockListEntity.getQuantityOccupied() -1);
distributionStockListMapper.updateById(distributionStockList);
}
return R.success("成功！！");
}
}

9
blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/IOuPaiFactoryService.java
Unescape View File

@ -16,10 +16,19 @@ public interface IOuPaiFactoryService {
String saveOuPaiPackageStatusByCode(String orderPackageCode,Integer event);
Boolean checkReceivingOrder(String code);
String saveOuPaiOutGoingOrderByCode(String orderCode, Integer event);
String savaOuPaiSignBillByCode(String orderCode, Integer event);
/**
* 保存数据到包件
* @param key 包件ID
* @param event 事件
* @param warehouseName 作业仓库
* @return
*/
String saveOuPaiPackageStatusByCodeByOld(String key, Integer event, String warehouseName);
/**

35
blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryDataServiceImpl.java
Unescape View File

@ -19,7 +19,6 @@ public class OuPaiFactoryDataServiceImpl implements IOuPaiFactoryDataService {
private final IOuPaiFactoryService ouPaiFactoryService;
@Override
public String saveData(OuPaiDataPushVO ouPaiDataPushVO) {
Integer event = ouPaiDataPushVO.getEvent();
@ -28,31 +27,39 @@ public class OuPaiFactoryDataServiceImpl implements IOuPaiFactoryDataService {
String key = ouPaiDataPushVO.getKey();
String warehouseName = ouPaiDataPushVO.getWarehouseName();
String code = null;
if(StringUtil.isBlank(typeName)){
log.info("#############saveData: 事件类型为空 typeName={}",typeName);
throw new CustomerException(403,"事件类型为空");
if (StringUtil.isBlank(typeName)) {
log.info("#############saveData: 事件类型为空 typeName={}", typeName);
throw new CustomerException(403, "事件类型为空");
}
if(event == 0){
if (event == 0) {
//收货单开始收货
}else if(event == 1){
} else if (event == 1) {
//收货单完成收货
}else if(event == 2){
} else if (event == 2) {
//包件收货
// todo 暂时关闭数据推送到新系统
//code = ouPaiFactoryService.saveOuPaiPackageStatusByCode(key,event);
// 老系统的
code = ouPaiFactoryService.saveOuPaiPackageStatusByCodeByOld(key,event,warehouseName);
}else if(event == 3){
// 包件收货需要验证 收货单是否在系统中存在
boolean isUpdate = ouPaiFactoryService.checkReceivingOrder(orderCode);
if (!isUpdate) {
log.info(">>>>>>>>>>>>>>>>>>>>>>>>>重新获取收货单信息 start>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>");
code = ouPaiFactoryService.saveOuPaiFactoryOrderDTOByCarCarNumber(orderCode);
log.info(">>>>>>>>>>>>>>>>>>>>>>>>>重新获取收货单信息 end>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>");
}
code = ouPaiFactoryService.saveOuPaiPackageStatusByCodeByOld(key, event, warehouseName);
} else if (event == 3) {
// 收货单创建
// 获取需要处理的数据并存入数据库
code = ouPaiFactoryService.saveOuPaiFactoryOrderDTOByCarCarNumber(orderCode);
}else if(event == 4){
} else if (event == 4) {
//配送单发运
code = ouPaiFactoryService.saveOuPaiOutGoingOrderByCode(orderCode,event);
}else if(event == 5){
code = ouPaiFactoryService.saveOuPaiOutGoingOrderByCode(orderCode, event);
} else if (event == 5) {
//签收单签收
code = ouPaiFactoryService.savaOuPaiSignBillByCode(orderCode,event);
}else if(event == 6){
code = ouPaiFactoryService.savaOuPaiSignBillByCode(orderCode, event);
} else if (event == 6) {
//签收单部分签收
// code = ouPaiFactoryService.savaOuPaiSignBillByCode(orderCode,event);
}

67
blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java
Unescape View File

@ -148,6 +148,15 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
@Override
public String saveOuPaiPackageStatusByCodeByOld(String key, Integer event, String warehouseName) {
// // 验证收货单的数据是否在系统中已经存在
// Boolean isUpdate = checkReceivingOrder(orderCode);
// if (!isUpdate) {
// // 重新获取收货单数据
// saveOuPaiFactoryOrderDTOByCarCarNumber(orderCode);
// }
QueryWrapper<FactoryPackageEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("oid", key);
FactoryPackageEntity packageEntity = factoryPackageService.getOne(queryWrapper);
@ -160,6 +169,8 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
String packageDetailNames = null;
String firstPackName, secondPackName, thirdPackName = null;
if (Objects.isNull(packageEntity)) {
// 需要对
log.warn("############oid 查询数据失败: {}", key);
// 查询欧派系统的的数据
String url = ouPaiProperties.getUri() + "tims_odata_api/api/odata/Package(" + key + ")?select=Code,PackageStatus,FirstClassCode,FirstClassName,SecondClassCode,SecondClassName,ThirdClassCode,ThirdClassName,PackageDetailNames,BuyIn,CosourcingCode,CosourcingUnit,Length,Width,Height,Weight,IsInventory,SendTime,ReceivingTime,CreateTime,ShipTime,CarNumber,DeliveryMethod&$expand=ReceivingOrders($select=Code,Type,Status,Plate,PackagesCount,ReceivePackageCount,PlateNum,CarNumber,CarrierCode,SendTime,ArrivalTime,ReceiveTime,CreateTime,ReturnNumber;$expand=EndWarehouse($select=Name,Code)&$expand=FromWarehouse($select=Name,Code)&$expand=CurrentWarehouse($select=Name,Code))&$expand=Order($select=SelfCode,Code)";
@ -267,6 +278,25 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
return key;
}
/**
* 查询收货单是否在我们系统存在
*
* @param code 收货单号
* @return true 表示 存在 false 表示不存在
*/
@Override
public Boolean checkReceivingOrder(String code) {
Boolean isUpdate = false;
LambdaQueryWrapper<ReceivingOrderEntity> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(ReceivingOrderEntity::getCode, code);
List<ReceivingOrderEntity> receivingOrderEntities = receivingOrderMapper.selectList(lambdaQueryWrapper);
if (ObjectUtils.isNotNull(receivingOrderEntities)) {
isUpdate = true;
}
return isUpdate;
}
@Override
public String saveOuPaiOutGoingOrderByCode(String orderCode, Integer event) {
@ -317,7 +347,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
String unitNo = orderStatusDTO.getUnitNo();
String operationTime = orderStatusDTO.getOperationTime();
// || "7".equals(status) 增加签收状态推送
if ("1".equals(status) || "2".equals(status) || "3".equals(status) || "5".equals(status) || "6".equals(status) || "8".equals(status) || "9".equals(status)) {
if ("1".equals(status) || "2".equals(status) || "3".equals(status) || "5".equals(status) || "6".equals(status) || "8".equals(status) || "9".equals(status)) {
log.warn("#############oupai-handleStatusData: 当前数据的状态不推送 status={}", status);
return Resp.fail(400, "当前数据的状态不推送");
}
@ -355,7 +385,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
}
boolean isPushHtNomal = checkOpfactoryOrderBusinessModel(factoryOrder);
if(isPushHtNomal){
if (isPushHtNomal) {
log.info("oupai- 该包条为汇通使用欧派系统进行作业类型型 不进行推送 >>> unitNo={} businessModel:{}", unitNo, factoryOrder.getBusinessModel());
return Resp.fail(400, "该包条为汇通使用欧派系统进行作业类型");
}
@ -368,11 +398,11 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
return Resp.fail(400, "未查询到该单据推送收货单信息");
}
if(StringUtil.isBlank(receivingOrderEntity.getCurrentWarehouseOid())){
if (StringUtil.isBlank(receivingOrderEntity.getCurrentWarehouseOid())) {
log.info(" 该订单为没有收货仓 不进行推送 >>> getCurrentWarehouseOid={} ", receivingOrderEntity.getCurrentWarehouseOid());
return Resp.fail(400, "收货仓信息不能为null");
}
if(!receivingOrderEntity.getCurrentWarehouseName().contains("仓")){
if (!receivingOrderEntity.getCurrentWarehouseName().contains("仓")) {
log.info(" 该订单为没有收货仓信息不正确 getCurrentWarehouseName={} ", receivingOrderEntity.getCurrentWarehouseName());
return Resp.fail(400, "该订单为没有收货仓信息不正确");
}
@ -383,29 +413,29 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
detailObject.put("WarehouseBelong", "oppein");
detailObject.put("Creator", orderStatusDTO.getUsername());
detailObject.put("PackageCode", unitNo);
if("4".equals(status)){
if ("4".equals(status)) {
detailObject.put("Operate", "收货");
}else if("7".equals(status)){
} else if ("7".equals(status)) {
detailObject.put("Operate", "发货");
}else{
} else {
log.info(" 该包件的状态不正确 status={} ", status);
return Resp.fail(400, "该包件的状态不正确");
}
// 查询系统的包件对象
LambdaQueryWrapper<FactoryPackageEntity> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(FactoryPackageEntity::getCode,unitNo);
lambdaQueryWrapper.eq(FactoryPackageEntity::getCode, unitNo);
FactoryPackageEntity factoryPackageEntity = factoryPackageService.getOne(lambdaQueryWrapper);
if(ObjectUtils.isNotNull(factoryPackageEntity)){
if (ObjectUtils.isNotNull(factoryPackageEntity)) {
// 推送数据
String url = ouPaiProperties.getUri()+"tims_odata_api/api/odata/PackageFeedbackRecord";
String url = ouPaiProperties.getUri() + "tims_odata_api/api/odata/PackageFeedbackRecord";
OpPackagePushLogEntity opPackagePushLogEntity = sendPushOuPaiData(factoryPackageEntity.getId(), url, 1, detailObject);
// 需要盘点这个对象的
String resp = opPackagePushLogEntity.getResp();
// 转换为json
// JSONObject respJson = JSONObject.parseObject(resp);
log.info(" >>>>>>>>>>>>>>>>>>>>>>> 推送欧派返回数据 {}",resp);
log.info(" >>>>>>>>>>>>>>>>>>>>>>> 推送欧派返回数据 {}", resp);
// TODO: 2023/10/25 不知道返回成功的状态是多少
// 需要修改包件对应的状态
@ -419,6 +449,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
/**
* 根据汇通业务提供是否操作欧派系统的商场 来决定是否会推数据
* 如果需要使用欧派系统 这里就需要不进行回传
*
* @param factoryOrder 工厂订单
* @return true 匹配到维护的商场 就不需要进行回传
*/
@ -426,11 +457,11 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
String shopCode = factoryOrder.getShopCode();
// 获取字典上配置
log.info(" >>>>>>>>>>>>>>>>>>>>>>> 传入的订单参数商场 {}",shopCode);
log.info(" >>>>>>>>>>>>>>>>>>>>>>> 传入的订单参数商场 {}", shopCode);
List<Dict> htUseOpShops = DictCache.getList("ht_use_op_shops");
log.info(" >>>>>>>>>>>>>>>>>>>>>>> 配置的使用欧派系统的商场 {}",htUseOpShops);
log.info(" >>>>>>>>>>>>>>>>>>>>>>> 配置的使用欧派系统的商场 {}", htUseOpShops);
for (Dict htUseOpShop : htUseOpShops) {
if(shopCode.equals(htUseOpShop.getDictKey())){
if (shopCode.equals(htUseOpShop.getDictKey())) {
return true;
}
}
@ -573,7 +604,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
analyzeData(resultArray);
opOrderStatusLogEntity.setDataStatus(1);
} catch (Exception e) {
log.error(">>>> TAG {} error {}",FactoryConstant.OUPAI, e.getMessage());
log.error(">>>> TAG {} error {}", FactoryConstant.OUPAI, e.getMessage());
opOrderStatusLogEntity.setDataStatus(2);
}
@ -660,8 +691,8 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
for (int j = 0; j < packages.size(); j++) {
JSONObject packageEntity = packages.getJSONObject(j);//包件信息
JSONObject orderEntity = packageEntity.getJSONObject("Order");//订单信息
if(orderEntity==null){
log.info("包件数据没有订单信息 packageCode {}",packageEntity.getString("Code"));
if (orderEntity == null) {
log.info("包件数据没有订单信息 packageCode {}", packageEntity.getString("Code"));
continue;
}
String selfCode = orderEntity.getString("SelfCode");//订单自编码
@ -951,7 +982,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
MultipartFile multi = getMultipartFile(logPath);
//上传到服务器
R r = ossClient.fileUpload(multi,"op-logs");
R r = ossClient.fileUpload(multi, "op-logs");
if (r.isSuccess()) {
BladeFile data = (BladeFile) r.getData();
return data.getLink();

33
blade-service/logpm-factory/src/main/java/com/logpm/factory/props/OldSystemProperties.java
Unescape View File

@ -1,33 +0,0 @@
//package com.logpm.factory.props;
//
//import lombok.Data;
//import org.springframework.boot.context.properties.ConfigurationProperties;
//import org.springframework.stereotype.Component;
//
///**
// * FactoryProperties
// *
// * @author pref
// */
//@Data
//@ConfigurationProperties(prefix = "old")
//@Component
//public class OldSystemProperties {
// /**
// * 请求地址
// */
// private String url;
//
// /**
// * 默认账号
// */
// private String pwd;
//
// /**
// * 默认用户
// */
// private String userId;
//
//
//
//}

279
blade-service/logpm-factory/src/test/java/com/logpm/factory/TestService.java
View File

File diff suppressed because one or more lines are too long

2
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/TaskQuestController.java
Unescape View File

@ -141,7 +141,7 @@ public class TaskQuestController extends BladeController {
*/
@GetMapping("/getDetailInfo")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "盘点任务 查询盘点数据", notes = "传入id")
@ApiOperation(value = "盘点任务 查询盘点明细数据", notes = "传入id")
public R<IPage<QuestDetailVO>> selectDataInfo(QuestDetailDTO questDetailDTO,Query query){
IPage<QuestDetailVO> page = taskQuestService.selectTaskDataInfo(questDetailDTO,Condition.getPage(query));
return R.data(page);

2
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseGoodsAllocationClient.java
Unescape View File

@ -68,6 +68,6 @@ public class WarehouseGoodsAllocationClient implements IWarehouseGoodsAllocation
lss.add(Long.parseLong(id));
}
return warehouseGoodsAllocationService.listByIds(lss);
return warehouseGoodsAllocationService.selectAllocationInfo(lss);
}
}

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

@ -174,6 +174,7 @@
<if test="param.allocationId != null and param.allocationId != ''">and allocation_id =#{param.allocationId } </if>
<if test="param.trayId != null and param.trayId != ''">and tray_id =#{param.trayId } </if>
<if test="param.orderCode != null and param.orderCode != ''">and order_code =#{param.orderCode } </if>
<if test="param.orderPackageCode != null and param.orderPackageCode != ''">and order_package_code =#{param.orderPackageCode } </if>
</where>
</select>
<select id="selectQuestDetailList" resultType="com.logpm.warehouse.entity.QuestDetailEntity">
@ -209,7 +210,11 @@
<if test="param.warehouseId != null and param.warehouseId != ''">and warehouse_id =#{param.warehouseId } </if>
<if test="param.allocationId != null and param.allocationId != ''">and allocation_id =#{param.allocationId } </if>
<if test="param.trayId != null and param.trayId != ''">and tray_id =#{param.trayId } </if>
<if test="param.orderCode != null and param.orderCode != ''">and order_code =#{param.orderCode } </if>
<if test="param.orderCode != null and param.orderCode != ''">and order_code like concat('%'#{param.orderCode },'%') </if>
<if test="param.categoryName != null and param.categoryName != ''">and category_name like concat('%'#{param.categoryName },'%') </if>
<if test="param.materialCode != null and param.materialCode != ''">and material_code like concat('%',#{param.materialCode },'%') </if>
<if test="param.trayCode != null and param.trayCode != ''">and tray_code like concat('%',#{param.trayCode },'%') </if>
<if test="param.marketName != null and param.marketName != ''">and market_name like concat('%',#{param.marketName},'%') </if>
<if test="param.orderPackageCode != null and param.orderPackageCode != ''">and order_package_code =#{param.orderPackageCode } </if>
<if test="param.marketNames != null">
and material_name in

7
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.java
Unescape View File

@ -169,4 +169,11 @@ public interface WarehouseGoodsAllocationMapper extends BaseMapper<WarehouseGood
List<Long> selectIsStocking(@Param("allocationId") Long allocationId);
Integer selectOrderNum(@Param("id") Long id);
/**
* 查询多个货位信息
* @param lss
* @return
*/
List<WarehouseGoodsAllocationEntity> selectAllocationInfo(@Param("ids") List<Long> ids);
}

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

@ -397,6 +397,41 @@
where lwug.allocation_id = #{id}
and lwug.is_deleted = 0
</select>
<select id="selectAllocationInfo" resultType="com.logpm.warehouse.entity.WarehouseGoodsAllocationEntity">
SELECT
lwgaa.id,
lwgaa.goods_area_id,
lwgaa.goods_allocation_name,
lwgaa.warehouse_id,
lwgaa.goods_shelf_id,
lwgaa.row_num,
lwgaa.enable_status,
lwgaa.allocation_status,
lwgaa.storey_num,
lwgaa.qr_code_url,
lwgaa.column_num,
lwgaa.layer_num,
lwgaa.template_id,
lwgaa.old_id,
lwgaa.old_qr_code,
lwgaa.tenant_id,
lwgaa.create_user,
lwgaa.create_dept,
lwgaa.create_time,
lwgaa.update_user,
lwgaa.update_time,
STATUS,
is_deleted,
CONCAT((SELECT lwga.headline FROM logpm_warehouse_goods_shelf AS lwgs INNER JOIN logpm_warehouse_goods_area AS lwga ON lwgs.goods_area_id = lwga.id WHERE lwgs.id = lwgaa.goods_shelf_id),'区-',lwgaa.qr_code) AS qrCode
FROM
logpm_warehouse_goods_allocation AS lwgaa
<where>
lwgaa.is_deleted = 0 and lwgaa.id in
<foreach collection="ids" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
</where>
</select>
</mapper>

7
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseGoodsAllocationService.java
Unescape View File

@ -118,4 +118,11 @@ public interface IWarehouseGoodsAllocationService extends BaseService<WarehouseG
* 货位 查询是否为备货区
*/
Boolean selectIsStocking(Long allocationId);
/**
* 查询多个货位信息
* @param lss
* @return
*/
List<WarehouseGoodsAllocationEntity> selectAllocationInfo(List<Long> lss);
}

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

@ -59,6 +59,7 @@ import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.system.cache.UserCache;
import org.springblade.system.entity.User;
import org.springblade.system.feign.IUserSearchClient;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -106,6 +107,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
private final IWarehouseTaryAllocationService taryAllocationService;
private final IWarehouseGoodsAllocationService warehouseGoodsAllocationService;
private final IUserSearchClient userSearchClient;
@Override
public IPage<TaskQuestVO> selectTaskQuestPage(IPage<TaskQuestVO> page, TaskQuestVO taskQuest) {
@ -475,9 +477,17 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
});
}
}
detailEntity.setStockNum(ObjectUtils.isNotNull( i.getQuantityStock()) ? i.getQuantityStock() : 0);
if(ObjectUtils.isNotNull(detailEntityList.isEmpty())){
List<QuestDetailEntity> collect = detailEntityList.stream().filter(q -> q.getStockId().equals(i.getId())).collect(Collectors.toList());
if(!collect.isEmpty()){
int sum = collect.stream().mapToInt(QuestDetailEntity::getStockNum).sum();
int i1 = i.getQuantityStock() - sum;
detailEntity.setStockNum(i1);
}else{
detailEntity.setStockNum(ObjectUtils.isNotNull( i.getQuantityStock()) ? i.getQuantityStock() : 0);
}
}
detailEntityList.add(detailEntity);
});
return detailEntityList;
}
@ -761,14 +771,24 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
Integer noReceivedNum = i.getNoReceivedNum();
Integer noRepairNum = i.getNoRepairNum();
if(stockNum > 0 || lossNum > 0 || deliveNum > 0 || wornNum > 0 || noReceivedNum > 0 || noRepairNum > 0){
//查询盘点包件信息
if(ObjectUtils.isNotNull(i.getOrderPackageCode())){
QuestDetailEntity questDetail = new QuestDetailEntity();
questDetail.setOrderPackageCode(i.getOrderPackageCode());
QuestDetailEntity questDetail1 = baseMapper.selectOneTaskInfo(taskSearchDTO.getQuestNum(), questDetail);
if(ObjectUtils.isNotNull(questDetail1)){
i.setId(questDetail1.getId());
}
}
//添加
List<QuestDetailChildEntity> childList = new ArrayList<>();
childList.add(addQuestDetailChild(stockNum,"10",taskID,warehouseId,questNum));
childList.add(addQuestDetailChild(wornNum,"20",taskID,warehouseId,questNum));
childList.add(addQuestDetailChild(lossNum,"30",taskID,warehouseId,questNum));
childList.add(addQuestDetailChild(noRepairNum,"40",taskID,warehouseId,questNum));
childList.add(addQuestDetailChild(deliveNum,"50",taskID,warehouseId,questNum));
childList.add(addQuestDetailChild(noReceivedNum,"60",taskID,warehouseId,questNum));
childList.add(addQuestDetailChild(stockNum,"10",i.getId(),warehouseId,questNum));
childList.add(addQuestDetailChild(wornNum,"20",i.getId(),warehouseId,questNum));
childList.add(addQuestDetailChild(lossNum,"30",i.getId(),warehouseId,questNum));
childList.add(addQuestDetailChild(noRepairNum,"40",i.getId(),warehouseId,questNum));
childList.add(addQuestDetailChild(deliveNum,"50",i.getId(),warehouseId,questNum));
childList.add(addQuestDetailChild(noReceivedNum,"60",i.getId(),warehouseId,questNum));
if(!childList.isEmpty()){
boolean b = childList.stream().anyMatch(ii -> ObjectUtils.isNull(ii.getId()));
if(b){
@ -781,6 +801,10 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
questDetail.setQuestStatus(1); //已盘
questDetail.setUpdateUser(user.getUserId());
questDetail.setUpdateTime(new Date());
if(ObjectUtils.isNotNull(i.getTrayId())){
questDetail.setTrayId(i.getTrayId());
questDetail.setTrayCode(i.getTrayCode());
}
list.add(questDetail);
baseMapper.updatePositionCodeList(taskSearchDTO.getQuestNum(),list);
}else{
@ -846,6 +870,9 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
if(!stockArticleInfo.isEmpty()){
//
questDetailVO.setOrderCode(stockArticleInfo.get(0).getOrderCode());
questDetailVO.setFirsts(stockArticleInfo.get(0).getDescriptionGoods());
questDetailVO.setDescriptionGoods(stockArticleInfo.get(0).getDescriptionGoods());
}
}else if(i.getQuestTarget().equals(3) && ObjectUtils.isNull(i.getOrderPackageId())){
@ -853,8 +880,23 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
DistributionStockListEntity stockListById = distributionStockListClient.getStockListById(i.getStockId());
if(ObjectUtils.isNotNull( stockListById)){
questDetailVO.setOrderCode(stockListById.getIncomingBatch());
questDetailVO.setMaterialName(stockListById.getDescriptionGoods() );
questDetailVO.setMaterialCode(stockListById.getCargoNumber () );
questDetailVO.setBrandName(stockListById.getBrandName());
}
}
if(ObjectUtils.isNotNull(i.getTrayId())){
//查询托盘名称
List<BasicdataTrayEntity> trayEntityList = basicdataTrayClient.getTrayEntityList(i.getTrayId());
if(ObjectUtils.isNotNull(trayEntityList)){
questDetailVO.setTrayName(trayEntityList.get(0).getPalletName());
}
}
if(!i.getQuestStatus().equals(0)){
R<List<User>> listR = userSearchClient.listByUser(String.valueOf(i.getUpdateUser()));
questDetailVO.setInventoryPerson(listR.getData().get(0).getName());
questDetailVO.setInventoryDate(i.getUpdateTime());
}
questDetailVOS.add(questDetailVO);
@ -929,6 +971,8 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
//查询的有数据的信息
// questDetailDTO.setQuestTarget(1);
List<QuestContrastVO> list = baseMapper.selectContrastDataInfo(questDetailDTO.getQuestNum(),questDetailDTO);
//查询托盘名称
List<BasicdataTrayEntity> trayEntityList = basicdataTrayClient.getTrayEntityList();
list.stream().forEach(i ->{
String[] split = i.getQuestStatus().split(",");
//盘点状态;0 待盘点 1. 已盘 2未盘点 3已排除
@ -957,7 +1001,22 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
if(ObjectUtils.isNull(i.getGroundingPositionCode())){
i.setGroundingPositionCode("无更新");
}
});
//处理托盘名称
if(ObjectUtils.isNotNull( i.getTrayId()) ) {
String[] split1 = i.getTrayId().split(",");
for (String s : split1) {
List<BasicdataTrayEntity> collect = trayEntityList.stream().filter(w -> w.getId().equals(Long.valueOf(s))).collect(Collectors.toList());
//托盘
if(ObjectUtils.isNull(collect) ){
i.setTrayName(collect.get(0).getPalletName());
}else if(ObjectUtils.isNotNull(i.getTrayName()) && !i.getTrayName().contains(i.getTrayName())){
i.setTrayName(i.getTrayCode()+","+collect.get(0).getPalletName());
}
}
}
});
//查询零担
QuestDetailEntity questContrastVO = new QuestDetailEntity();
questContrastVO.setQuestId(questDetailDTO.getQuestId());
@ -1007,9 +1066,23 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
//托盘
if(ObjectUtils.isNotNull(i.getTrayCode())){
if(ObjectUtils.isNull(q.getTrayCode()) ){
q.setTrayCode(i.getPositionCode());
q.setTrayCode(i.getTrayCode());
}else if(ObjectUtils.isNotNull(q.getTrayCode()) && !q.getTrayCode().contains(i.getTrayCode())){
q.setTrayCode(q.getTrayCode()+","+i.getPositionCode());
q.setTrayCode(q.getTrayCode()+","+i.getTrayCode());
}
}
//处理托盘名称
if(ObjectUtils.isNotNull( i.getTrayId()) ) {
String[] split1 = i.getTrayId().split(",");
for (String s : split1) {
List<BasicdataTrayEntity> collect = trayEntityList.stream().filter(w -> w.getId().equals(Long.valueOf(s))).collect(Collectors.toList());
//托盘
if(ObjectUtils.isNull(collect) ){
i.setTrayName(collect.get(0).getPalletName());
}else if(ObjectUtils.isNotNull(i.getTrayName()) && !i.getTrayName().contains(i.getTrayName())){
i.setTrayName(i.getTrayCode()+","+collect.get(0).getPalletName());
}
}
}
//更新的货位
@ -1066,9 +1139,9 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
//托盘
if(ObjectUtils.isNotNull(i.getTrayCode())){
if(ObjectUtils.isNull(q.getTrayCode()) ){
q.setTrayCode(i.getPositionCode());
q.setTrayCode(i.getTrayCode());
}else if(ObjectUtils.isNotNull(q.getTrayCode()) && !q.getTrayCode().contains(i.getTrayCode())){
q.setTrayCode(q.getTrayCode()+","+i.getPositionCode());
q.setTrayCode(q.getTrayCode()+","+i.getTrayCode());
}
}
//更新的货位
@ -1079,6 +1152,20 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
q.setGroundingPositionCode(q.getGroundingPositionCode()+","+i.getGroundingPositionCode());
}
}
//处理托盘名称
if(ObjectUtils.isNotNull( i.getTrayId()) ) {
String[] split1 = i.getTrayId().split(",");
for (String s : split1) {
List<BasicdataTrayEntity> collect = trayEntityList.stream().filter(w -> w.getId().equals(Long.valueOf(s))).collect(Collectors.toList());
//托盘
if(ObjectUtils.isNull(collect) ){
i.setTrayName(collect.get(0).getPalletName());
}else if(ObjectUtils.isNotNull(i.getTrayName()) && !i.getTrayName().contains(i.getTrayName())){
i.setTrayName(i.getTrayCode()+","+collect.get(0).getPalletName());
}
}
}
});
q.setDifferenceNum(stockListBy.getQuantityStock() - yi.get());
@ -1523,6 +1610,11 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
.forEach((k, v) -> {
TaskTrayVO taskTrayVO = new TaskTrayVO();
taskTrayVO.setTrayId(Long.valueOf(k));
//查询托盘信息
List<BasicdataTrayEntity> trayEntityList = basicdataTrayClient.getTrayEntityList(k);
if(ObjectUtils.isNotNull(trayEntityList)){
taskTrayVO.setTrayName(trayEntityList.get(0).getPalletName());
}
AtomicReference<Integer> num = new AtomicReference<>(0); //总数
AtomicReference<Integer> unTotal = new AtomicReference<>(0); //盘点数
List<QuestDetailVO> list2 = new ArrayList<>();
@ -2581,11 +2673,11 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
questDetail.setQuestId(questId);
questDetail.setMarketNames(marketNames);
List<QuestDetailEntity> questDetailEntity = baseMapper.selectQuestDetailList(taskSearchDTO.getQuestNum(), questDetail);
if(ObjectUtils.isNull(questDetailEntity) ||questDetailEntity.isEmpty()){
List<QuestDetailEntity> questDetailEntityList = baseMapper.selectQuestDetailList(taskSearchDTO.getQuestNum(), questDetail);
if(questDetailEntityList.isEmpty() || ObjectUtils.isNull(questDetailEntityList) || ObjectUtils.isNull(questDetailEntityList.get(0).getQuestId())){
return R.fail(5000,"包件信息不存在！！");
}
for (QuestDetailEntity i : questDetailEntity) {
for (QuestDetailEntity i : questDetailEntityList) {
if(i.getQuestStatus().equals(1)){
return Resp.scanFail("当前包件已盘点！","当前包件已盘点！");
}
@ -2594,7 +2686,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
// questDetailEntity = new QuestDetailEntity();
// questDetailEntity.setOrdePackageCode(orderPackageCode);
// }
return R.data(questDetailEntity);
return R.data(questDetailEntityList);
}
/**

6
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseGoodsAllocationServiceImpl.java
Unescape View File

@ -392,6 +392,12 @@ public class WarehouseGoodsAllocationServiceImpl extends BaseServiceImpl<Warehou
return null == list && list.isEmpty()?true:false;
}
@Override
public List<WarehouseGoodsAllocationEntity> selectAllocationInfo(List<Long> lss) {
return baseMapper.selectAllocationInfo(lss);
}
public List<Long> getMyWatchWarehouseIds(){
//获取当前登录人仓库
List<BasicdataWarehouseEntity> myWatchWarehouse = basicdataWarehouseClient.getMyWatchWarehouse();

56
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseRetentionRecordServiceImpl.java
Unescape View File

@ -168,6 +168,12 @@ public class WarehouseRetentionRecordServiceImpl extends BaseServiceImpl<Warehou
if (Func.isNotEmpty(retentionScanEntityList)) {
warehouseRetentionRecordVO.setRetentionScanVOList(WarehouseRetentionScanWrapper.build().listVO(retentionScanEntityList));
}
warehouseRetentionRecordVO.setRetentionTotal(0);
if(Func.isNotEmpty(retentionScanEntityList)){
int retentionTotal = retentionScanEntityList.stream().mapToInt(WarehouseRetentionScanEntity::getRetentionQuantity).sum();
warehouseRetentionRecordVO.setRetentionTotal(retentionTotal);
}
return warehouseRetentionRecordVO;
}
@ -203,29 +209,31 @@ public class WarehouseRetentionRecordServiceImpl extends BaseServiceImpl<Warehou
AtomicInteger retentionTotal = new AtomicInteger();
AtomicBoolean saveFlah = new AtomicBoolean(false);
warehouseRetentionScanDTOS.forEach(r -> {
//查询是否进行多次滞留
WarehouseRetentionScanEntity retentionScanServiceOne = warehouseRetentionScanService.getOne(Wrappers.<WarehouseRetentionScanEntity>query().lambda()
.eq(WarehouseRetentionScanEntity::getConditions, r.getConditions())
.eq(WarehouseRetentionScanEntity::getOrderPackageId, r.getOrderPackageId())
.eq(WarehouseRetentionScanEntity::getReservationId, r.getReservationId())
.eq(WarehouseRetentionScanEntity::getOrderId, r.getOrderId())
.eq(WarehouseRetentionScanEntity::getOrderCode, r.getOrderCode())
.eq(WarehouseRetentionScanEntity::getScanType, r.getScanType())
.eq(WarehouseRetentionScanEntity::getCancelRetentionStatus, IsOrNoConstant.no.getValue())
);
//避免重复添加相同的滞留包件数据
if (Func.isEmpty(retentionScanServiceOne)) {
r.setRetentionScanTime(new Date());
r.setRetentionScanUserId(user.getUserId());
r.setRetentionScanUsername(user.getNickName());
r.setRetentionQuantity(r.getRetentionQuantity());
retentionTotal.getAndAdd(r.getRetentionQuantity());
r.setDeliveryId(warehouseRetentionRecordDTO.getDeliveryId());
r.setRefId(warehouseRetentionRecordEntity.getId());
//进行滞留之后需要对包件进行取消配送的操作
Integer conditions = r.getConditions();
warehouseRetentionScanService.save(Func.copy(r, WarehouseRetentionScanEntity.class));
switch (conditions) {
if (r.getConditions().equals(1)){
//查询是否进行多次滞留
WarehouseRetentionScanEntity retentionScanServiceOne = warehouseRetentionScanService.getOne(Wrappers.<WarehouseRetentionScanEntity>query().lambda()
.eq(WarehouseRetentionScanEntity::getConditions, r.getConditions())
.eq(WarehouseRetentionScanEntity::getOrderPackageId, r.getOrderPackageId())
.eq(WarehouseRetentionScanEntity::getReservationId, r.getReservationId())
.eq(WarehouseRetentionScanEntity::getOrderId, r.getOrderId())
.eq(WarehouseRetentionScanEntity::getOrderCode, r.getOrderCode())
.eq(WarehouseRetentionScanEntity::getScanType, r.getScanType())
.eq(WarehouseRetentionScanEntity::getCancelRetentionStatus, IsOrNoConstant.no.getValue())
);
//避免重复添加相同的滞留包件数据
if (Func.isEmpty(retentionScanServiceOne)) {
r.setRetentionScanTime(new Date());
r.setRetentionScanUserId(user.getUserId());
r.setRetentionScanUsername(user.getNickName());
r.setRetentionQuantity(r.getRetentionQuantity());
retentionTotal.getAndAdd(r.getRetentionQuantity());
r.setDeliveryId(warehouseRetentionRecordDTO.getDeliveryId());
r.setRefId(warehouseRetentionRecordEntity.getId());
//进行滞留之后需要对包件进行取消配送的操作
Integer conditions = r.getConditions();
warehouseRetentionScanService.save(Func.copy(r, WarehouseRetentionScanEntity.class));
}
switch (r.getConditions()) {
case 1:
//订制品
saveFlah.set(distributionDeliveryListClient.retentionDeliveryReservationPackage(r.getDeliveryId(), r.getReservationId(), r.getOrderPackageId(), r.getConditions()));
@ -390,8 +398,6 @@ public class WarehouseRetentionRecordServiceImpl extends BaseServiceImpl<Warehou
}else {
return null;
}
return warehouseRetentionRecordVO;
}

8
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java
Unescape View File

@ -762,10 +762,10 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode,warehouseId);
Integer conditions = parcelListEntity.getConditions();
Integer quantity = parcelListEntity.getQuantity();
if(conditions != 1){
log.warn("##############upShelfPackage: 包件已转库存品 orderPackageCode={}",orderPackageCode);
continue;
}
// if(conditions != 1){
// log.warn("##############upShelfPackage: 包件已转库存品 orderPackageCode={}",orderPackageCode);
// continue;
// }
if(StringUtil.hasLength(trayCode)){
//存入托盘信息
warehouseTrayTypeService.orderScanOrderPackageCode(trayType,trayCode,orderPackageCode,warehouseId);

20
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/wrapper/TaskQuestVOWrapper.java
Unescape View File

@ -17,6 +17,7 @@
package com.logpm.warehouse.wrapper;
import cn.hutool.core.util.ObjectUtil;
import com.logpm.warehouse.vo.TaskQuestVO;
import org.springblade.common.constant.DictBizConstant;
import org.springblade.core.mp.support.BaseEntityWrapper;
@ -25,6 +26,9 @@ import org.springblade.core.tool.utils.SpringUtil;
import org.springblade.system.cache.DictBizCache;
import org.springblade.system.entity.User;
import org.springblade.system.feign.IUserClient;
import org.springblade.system.feign.IUserSearchClient;
import java.util.List;
/**
@ -34,6 +38,8 @@ import org.springblade.system.feign.IUserClient;
* @since 2023-10-12
*/
public class TaskQuestVOWrapper extends BaseEntityWrapper<TaskQuestVO, TaskQuestVO> {
IUserSearchClient userSearchClient = SpringUtil.getBean(IUserSearchClient.class) ;
IUserClient userCliient = SpringUtil.getBean(IUserClient.class);
public static TaskQuestVOWrapper build() {
return new TaskQuestVOWrapper();
@ -41,8 +47,18 @@ public class TaskQuestVOWrapper extends BaseEntityWrapper<TaskQuestVO, TaskQuest
@Override
public TaskQuestVO entityVO(TaskQuestVO taskQuest) {
taskQuest.setOperatorName(userCliient.userInfoById(taskQuest.getCreateUser()).getData().getName());
taskQuest.setQuestStatusName(DictBizCache.getValue(DictBizConstant.WAREHOUSE_QUEST_STATUS, taskQuest.getQuestStatus()));
if(ObjectUtil.isNotNull(taskQuest.getCreateUser())){
R<List<User>> listR = userSearchClient.listByUser(String.valueOf(taskQuest.getCreateUser()));
// R<User> userR = userCliient.userInfoById(taskQuest.getCreateUser());
if( !listR.getData().isEmpty() && ObjectUtil.isNotNull(listR.getData()) && ObjectUtil.isNotNull(listR.getData().get(0)) ){
String name = listR.getData().get(0).getName();
taskQuest.setOperatorName(name);
}
}
if(ObjectUtil.isNotNull(taskQuest.getQuestStatus())){
taskQuest.setQuestStatusName(DictBizCache.getValue(DictBizConstant.WAREHOUSE_QUEST_STATUS, taskQuest.getQuestStatus()));
}
return taskQuest;
}

Write Preview
Loading…
Cancel
Save