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

Merge remote-tracking branch 'origin/dev' into dev

training
pref_mail@163.com 1 year ago
parent
291453b4df 9ef6866abb
commit
cd519d00b7
16 changed files with 86 additions and 21 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. 1
      blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/ParcelListVO.java
  2. 1
      blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/PositionVO.java
  3. 1
      blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TrayTypeDataVO.java
  4. 1
      blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/UpShelfAllocationVO.java
  5. 1
      blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/UpShelfDataVO.java
  6. 2
      blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseTrayTypeVO.java
  7. 3
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAllocationMapper.xml
  8. 2
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java
  9. 30
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java
  10. 11
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml
  11. 4
      blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/FactoryTokenServiceImpl.java
  12. 2
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTaskApiController.java
  13. 20
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayGoodsMapper.xml
  14. 3
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayTypeMapper.xml
  15. 22
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java
  16. 3
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java

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

@ -13,6 +13,7 @@ public class ParcelListVO implements Serializable {
private String pinming;//品名
private Long trayGoodsId;//
private Long trayId;//
private String trayCode;//托盘编码
private String trayName;//托盘名称
private Long warehouseId;//
private String warehouseName;//仓库名称

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

@ -12,6 +12,7 @@ public class PositionVO implements Serializable {
private String allocationName;//货位
private String warehouseName;//仓库
private String trayCode;//托盘
private String trayName;//托盘名称
private Integer num;//数量
}

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

@ -15,6 +15,7 @@ public class TrayTypeDataVO implements Serializable {
private Long trayTypeId;
private String trayCode;//托盘码
private String trayName;//托盘名称
private Integer trayNum;//托盘件数

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

@ -23,6 +23,7 @@ public class UpShelfAllocationVO implements Serializable {
private Integer stockNum;//库存品数量
private Long trayId;//托盘id
private String trayCode;//托盘编码
private String trayName;//托盘名称
private Integer trayNum;//托盘数量
private Integer orderNum;//单数

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

@ -11,6 +11,7 @@ public class UpShelfDataVO implements Serializable {
private String waybillNo;//运单号
private String orderPackageCode;//包条码
private String trayCode;//托盘号
private String trayName;//托盘名称
private Integer totalNum;//订单总数量
private Integer shelfNum;//上架数据
private Integer completeSet;//是否齐套1否 2是

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

@ -10,4 +10,6 @@ public class WarehouseTrayTypeVO extends WarehouseTrayTypeEntity {
private String trayTypeName;
private String trayName;
}

3
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAllocationMapper.xml
Unescape View File

@ -78,7 +78,8 @@
goods_allocation.reserve4,
goods_allocation.reserve5,
goods_allocation.goods_area_id,
CONCAT(goods_allocation.layer_num,'层',goods_allocation.column_num,'列') goodsAllocationName,
-- CONCAT(goods_allocation.layer_num,'层',goods_allocation.column_num,'列') goodsAllocationName,
goods_allocation.qr_code goodsAllocationName ,
-- goods_allocation.goods_allocation_name,
goods_allocation.warehouse_id,
goods_allocation.goods_shelf_id,

2
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java
Unescape View File

@ -337,6 +337,8 @@ public class BasicdataGoodsAreaServiceImpl extends BaseServiceImpl<BasicdataGood
List<BasicdatavisualizationSheetOne> basicdatavisualizationSheetOnes = baseMapper.exportWarehouseByorderId(warehouseId);
basicdatavisualizationSheetOnes.forEach(e->{
if (StringUtils.isNotBlank(e.getThirdProduct())){e.setThirdProduct(this.countUniqueProperties(e.getThirdProduct()));}
if(StringUtils.isNotBlank(e.getMaterialName())){e.setMaterialName(this.countUniqueProperties(e.getMaterialName()));}
if(StringUtils.isNotBlank(e.getMaterialCode())){e.setMaterialName(this.countUniqueProperties(e.getMaterialCode()));}
});
//sheetTwo
List<BasicdatavisualizationSheetTwo> basicdatavisualizationSheetTwos = baseMapper.exportWarehouseByallocation(warehouseId);

30
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java
Unescape View File

@ -357,20 +357,22 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
for (Integer i = 0; i < rowNum; i++) {
for (Integer j = 0; j < storeyNum; j++) {
BasicdataGoodsAllocationEntity basicdataGoodsAllocationEntity = new BasicdataGoodsAllocationEntity();
//设置所在列
basicdataGoodsAllocationEntity.setColumnNum(i + 1);
//设置所在层
basicdataGoodsAllocationEntity.setLayerNum(j + 1);
int row = i + 1;
int layer = j + 1;
//设置所在列
basicdataGoodsAllocationEntity.setColumnNum(row);
//设置所在层
basicdataGoodsAllocationEntity.setLayerNum(layer);
// basicdataGoodsAllocationEntity.setQrCode(allocationCode + "-" + row + "-" + layer);
// basicdataGoodsAllocationEntity.setWarehouseId(basicdataGoodsShelfEntity.getWarehouseId());
basicdataGoodsAllocationEntity.setGoodsAreaId(basicdataGoodsShelfDTO.getGoodsAreaId());
basicdataGoodsAllocationEntity.setGoodsShelfId(basicdataGoodsShelfDTO.getId());
basicdataGoodsAllocationEntity.setGoodsAllocationName(layer + "-" + row);
basicdataGoodsAllocationEntity.setWarehouseId(ck);
String code = basicTenantCodeClient.shelfCode(AuthUtil.getTenantId(), "5");
String allocationCode = basicdataGoodsShelfDTO.getGoodsShelfName()+"-" + basicdataGoodsAllocationEntity.getColumnNum() + "-" + basicdataGoodsAllocationEntity.getLayerNum() ;
//String code = basicTenantCodeClient.shelfCode(AuthUtil.getTenantId(), "5");
// String allocationCode = basicdataGoodsShelfDTO.getGoodsShelfName()+"-" + basicdataGoodsAllocationEntity.getColumnNum() + "-" + basicdataGoodsAllocationEntity.getLayerNum() ;
String allocationCode =basicdataGoodsShelfDTO.getGoodsShelfName()+"排-" +basicdataGoodsAllocationEntity.getLayerNum() + "层-" + basicdataGoodsAllocationEntity.getColumnNum() +"列";
basicdataGoodsAllocationEntity.setQrCode(allocationCode);
// basicdataGoodsAllocationEntity.setAllocationStatuc("1");
// basicdataGoodsAllocationEntity.setEnableStatus("1");
@ -422,7 +424,9 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
basicdataGoodsAllocationEntity.setLayerNum(z);
basicdataGoodsAllocationEntity.setGoodsAreaId(basicdataGoodsShelfDTO.getGoodsAreaId());
basicdataGoodsAllocationEntity.setGoodsShelfId(basicdataGoodsShelfDTO.getId());
String allocationCode =basicdataGoodsShelfDTO.getGoodsShelfName()+"排-" +basicdataGoodsAllocationEntity.getLayerNum() + "层-" + basicdataGoodsAllocationEntity.getColumnNum() +"列";
basicdataGoodsAllocationEntity.setGoodsAllocationName(z + "-" + k);
basicdataGoodsAllocationEntity.setQrCode(allocationCode);
basicdataGoodsAllocationEntity.setWarehouseId(ck);
arrayList.add(basicdataGoodsAllocationEntity);
}
@ -440,7 +444,7 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
basicdataGoodsAllocationEntity.setGoodsAllocationName(z + "-" + k);
basicdataGoodsAllocationEntity.setWarehouseId(ck);
// String code = basicTenantCodeClient.shelfCode(AuthUtil.getTenantId(), "5");
String allocationCode = basicdataGoodsShelfDTO.getGoodsShelfName()+"-" + basicdataGoodsAllocationEntity.getColumnNum() + "-" + basicdataGoodsAllocationEntity.getLayerNum() ;
String allocationCode =basicdataGoodsShelfDTO.getGoodsShelfName()+"排-" +basicdataGoodsAllocationEntity.getLayerNum() + "层-" + basicdataGoodsAllocationEntity.getColumnNum() +"列";
basicdataGoodsAllocationEntity.setQrCode(allocationCode);
arrayList.add(basicdataGoodsAllocationEntity);
}
@ -485,7 +489,8 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
basicdataGoodsAllocationEntity.setGoodsAllocationName(i + "-" + k);
basicdataGoodsAllocationEntity.setWarehouseId(ck);
// String code = basicTenantCodeClient.shelfCode(AuthUtil.getTenantId(), "5");
String allocationCode = basicdataGoodsShelfDTO.getGoodsShelfName()+"-" + basicdataGoodsAllocationEntity.getColumnNum() + "-" + basicdataGoodsAllocationEntity.getLayerNum() ;
String allocationCode =basicdataGoodsShelfDTO.getGoodsShelfName()+"排-" +basicdataGoodsAllocationEntity.getLayerNum() + "层-" + basicdataGoodsAllocationEntity.getColumnNum() +"列";
// basicdataGoodsAllocationEntity.setGoodsAllocationName(allocationCode);
basicdataGoodsAllocationEntity.setQrCode(allocationCode);
arrayList.add(basicdataGoodsAllocationEntity);
}
@ -533,10 +538,11 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
basicdataGoodsAllocationEntity.setLayerNum(z);
basicdataGoodsAllocationEntity.setGoodsAreaId(basicdataGoodsShelfDTO.getGoodsAreaId());
basicdataGoodsAllocationEntity.setGoodsShelfId(basicdataGoodsShelfDTO.getId());
basicdataGoodsAllocationEntity.setGoodsAllocationName(z + "-" + i);
// basicdataGoodsAllocationEntity.setGoodsAllocationName(z + "-" + i);
basicdataGoodsAllocationEntity.setWarehouseId(ck);
// String code = basicTenantCodeClient.shelfCode(AuthUtil.getTenantId(), "5");
String allocationCode = basicdataGoodsShelfDTO.getGoodsShelfName()+"-" + basicdataGoodsAllocationEntity.getColumnNum() + "-" + basicdataGoodsAllocationEntity.getLayerNum() ;
String allocationCode =basicdataGoodsShelfDTO.getGoodsShelfName()+"排-" +basicdataGoodsAllocationEntity.getLayerNum() + "层-" + basicdataGoodsAllocationEntity.getColumnNum() +"列";
basicdataGoodsAllocationEntity.setGoodsAllocationName(z + "-" + i);
basicdataGoodsAllocationEntity.setQrCode(allocationCode);
arrayList.add(basicdataGoodsAllocationEntity);
}
@ -635,7 +641,7 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
basicdataGoodsAllocationEntity.setGoodsShelfId(basicdataGoodsShelfDTO.getId());
basicdataGoodsAllocationEntity.setGoodsAllocationName(z + "-" + i);
// String code = basicTenantCodeClient.shelfCode(AuthUtil.getTenantId(), "5");
String allocationCode = basicdataGoodsShelfDTO.getGoodsShelfName()+"-" + basicdataGoodsAllocationEntity.getColumnNum() + "-" + basicdataGoodsAllocationEntity.getLayerNum() ;
String allocationCode =basicdataGoodsShelfDTO.getGoodsShelfName()+"排-" +basicdataGoodsAllocationEntity.getLayerNum() + "层-" + basicdataGoodsAllocationEntity.getColumnNum() +"列";
basicdataGoodsAllocationEntity.setQrCode(allocationCode);
basicdataGoodsAllocationEntity.setWarehouseId(ck);
arrayList.add(basicdataGoodsAllocationEntity);
@ -845,6 +851,8 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
basicdataGoodsAllocationEntity.setGoodsAreaId(basicdataGoodsShelfDTO.getGoodsAreaId());
basicdataGoodsAllocationEntity.setGoodsShelfId(basicdataGoodsShelfDTO.getId());
basicdataGoodsAllocationEntity.setGoodsAllocationName(z + "-" + k);
String allocationCode =basicdataGoodsShelfDTO.getGoodsShelfName()+"排-" +basicdataGoodsAllocationEntity.getLayerNum() + "层-" + basicdataGoodsAllocationEntity.getColumnNum() +"列";
basicdataGoodsAllocationEntity.setQrCode(allocationCode);
basicdataGoodsAllocationEntity.setWarehouseId(ck);
arrayList.add(basicdataGoodsAllocationEntity);
}

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

@ -84,6 +84,9 @@
</if>
<if test="param.firsts !='' and param.firsts != null">
and ldpl.firsts = #{param.firsts}
</if>
<if test="param.second !='' and param.second != null">
and ldpl.second = #{param.second}
</if>
<if test="param.thirdProduct !='' and param.thirdProduct != null">
and ldpl.third_product = #{param.thirdProduct}
@ -110,7 +113,13 @@
and ldpl.brand_name like concat('%',#{param.brandName},'%')
</if>
<if test="param.orderPackageFreezeStatus !='' and param.orderPackageFreezeStatus != null">
and ldpl.order_package_freeze_status like concat('%',#{param.orderPackageFreezeStatus},'%')
and ldpl.order_package_freeze_status = #{param.orderPackageFreezeStatus}
</if>
<if test="param.pallet !='' and param.pallet != null">
and lwtg.tray_code = #{param.pallet}
</if>
<if test="param.goodsAllocation !='' and param.goodsAllocation != null">
and lwtg.position_code = #{param.goodsAllocation}
</if>
</where>

4
blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/FactoryTokenServiceImpl.java
Unescape View File

@ -32,14 +32,14 @@ public class FactoryTokenServiceImpl extends BaseServiceImpl<FactoryTokenMapper,
.eq("corpid",corpId);
FactoryToken factoryToken = baseMapper.selectOne(queryWrapper);
if(Objects.isNull(factoryToken)){
logger.warn("#########verifyToken: token验证不通过 token={}，corpid={}",token,corpId);
logger.error("#########verifyToken: token验证不通过 token={}，corpid={}",token,corpId);
return false;
}
Long expireTimeLong = factoryToken.getExpireTime().getTime();
Long now = new Date().getTime();
//判断是否过期
if(now > expireTimeLong){
logger.warn("#########verifyToken: token验证不通过 已过期 token={}，corpId={}",token,corpId);
logger.error("#########verifyToken: token验证不通过 已过期 token={}，corpId={}",token,corpId);
return false;
}
return true;

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

@ -8,6 +8,7 @@ import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
import com.logpm.warehouse.dto.QuestDetailDTO;
import com.logpm.warehouse.dto.TaskSearchDTO;
import com.logpm.warehouse.entity.QuestDetailEntity;
import org.springblade.core.mp.support.Query;
import com.logpm.warehouse.service.ITaskQuestService;
import com.logpm.warehouse.vo.TaskContractVO;
import com.logpm.warehouse.vo.TaskQuestApiVO;
@ -19,7 +20,6 @@ import lombok.AllArgsConstructor;
import lombok.extern.log4j.Log4j2;
import org.springblade.common.exception.CustomerException;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringUtil;

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

@ -23,17 +23,20 @@
<select id="getUpListByTrayTypeId" resultType="com.logpm.warehouse.vo.UpShelfDataVO">
select ldpl.order_code orderCode,
lwtg.tray_code trayCode,
lwt.pallet_name trayName,
1 goodsType,
sum(lwtg.num) shelfNum,
max(ldsa.total_number) totalNum
from logpm_warehouse_tray_goods lwtg
left join logpm_warehouse_tray lwt on lwt.id = lwtg.tray_id and lwt.is_deleted = 0
left join logpm_distribution_parcel_list ldpl on ldpl.id = lwtg.association_id and ldpl.is_deleted = 0
left join logpm_distribution_stock_article ldsa on ldpl.order_code = ldsa.order_code and ldsa.is_deleted = 0
where 1=1
and lwtg.is_deleted = 0
and lwtg.tray_type_id = #{trayTypeId}
group by ldpl.order_code,
lwtg.tray_code
lwtg.tray_code,
lwt.pallet_name
</select>
<select id="getListByTrayTypeIdAndOrderCode" resultType="com.logpm.distribution.entity.DistributionParcelListEntity">
@ -66,10 +69,12 @@
select ldsa.order_code orderCode,
ldsa.waybill_number waybillNo,
lwtg.tray_code trayCode,
lwt.pallet_name trayName,
2 goodsType,
lwtg.num shelfNum,
ldsa.total_number totalNum
from logpm_warehouse_tray_goods lwtg
left join logpm_warehouse_tray lwt on lwt.id = lwtg.tray_id and lwt.is_deleted = 0
left join logpm_distribution_stock_article ldsa on ldsa.id = lwtg.association_id and ldsa.is_zero = 1 and ldsa.is_deleted = 0
where lwtg.is_deleted = 0
and lwtg.tray_type_id = #{trayTypeId}
@ -117,6 +122,7 @@
<select id="getStockUpListByTrayTypeId" resultType="com.logpm.warehouse.vo.UpShelfDataVO">
select ldsl.order_code orderCode,
lwtg.tray_code trayCode,
lwt.pallet_name trayName,
ldsl.quantity_stock totalNum,
lwtg.num shelfNum,
3 goodsType,
@ -126,6 +132,7 @@
ldsl.description_goods materialName,
lwtg.incoming_batch incomingBatch
from logpm_warehouse_tray_goods lwtg
left join logpm_warehouse_tray lwt on lwt.id = lwtg.tray_id and lwt.is_deleted = 0
left join logpm_distribution_stock_list ldsl on ldsl.material_id = lwtg.association_id and lwtg.market_id = ldsl.market_id and lwtg.incoming_batch = ldsl.incoming_batch and lwtg.warehouse_id = ldsl.warehouse_id and ldsl.is_deleted = 0
where lwtg.is_deleted = 0
and lwtg.tray_type_id = #{trayTypeId}
@ -236,7 +243,8 @@
CONCAT(ldpl.firsts,'-',ldpl.`second`,'-',ldpl.third_product) pinming,
lwtg.id trayGoodsId,
lwt.id trayId,
lwt.pallet_code trayName,
lwt.pallet_code trayCode,
lwt.pallet_name trayName,
ldpl.warehouse_id warehouseId,
ldpl.`warehouse` warehouseName,
lwug.area_title areaTitle,
@ -263,8 +271,10 @@
<select id="getTrayGoodsByZeroOrderIdNoAllocationId" resultType="com.logpm.warehouse.vo.PositionVO">
select lwtg.tray_code trayCode,
lwt.pallet_name trayName,
lwtg.num num
from logpm_warehouse_tray_goods lwtg
left join logpm_warehouse_tray lwt on lwt.id = lwtg.tray_id and lwt.is_deleted = 0
left join logpm_warehouse_tary_allocation lwta on lwta.tray_id = lwtg.tray_id and lwta.is_deleted = 0
where lwtg.association_id = #{orderId}
and lwtg.warehouse_id = #{warehouseId}
@ -274,8 +284,10 @@
<select id="getTrayGoodsByStockNoAllocationId" resultType="com.logpm.warehouse.vo.PositionVO">
SELECT
lwtg.tray_code trayCode,
lwt.pallet_name trayName,
lwtg.num num
FROM logpm_warehouse_tray_goods lwtg
left join logpm_warehouse_tray lwt on lwt.id = lwtg.tray_id and lwt.is_deleted = 0
LEFT JOIN logpm_warehouse_tary_allocation lwta ON lwta.tray_id = lwtg.tray_id AND lwta.is_deleted = 0
WHERE lwtg.market_id = #{marketId}
and lwtg.association_value = #{materialCode}
@ -287,8 +299,8 @@
select
COALESCE (lwtg.num ,0) l
from logpm_warehouse_tray_goods lwtg
JOIN logpm_distribution_stock_list ldsl on lwtg.association_id =ldsl.material_id
left join logpm_warehouse_tary_allocation lwta on lwta.tray_id = lwtg.tray_id and lwta.is_deleted = 0
JOIN logpm_distribution_stock_list ldsl on lwtg.association_id =ldsl.material_id
left join logpm_warehouse_tary_allocation lwta on lwta.tray_id = lwtg.tray_id and lwta.is_deleted = 0
where ldsl.id = #{id}
and lwta.id is null
</select>

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

@ -2,9 +2,10 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.logpm.warehouse.mapper.WarehouseTrayTypeMapper">
<select id="orderPageList" resultType="com.logpm.warehouse.vo.WarehouseTrayTypeVO">
<select id="orderPageList" resultType="com.logpm.warehouse.entity.WarehouseTrayTypeEntity">
select lwtt.*
from logpm_warehouse_tray_type lwtt
left join logpm_warehouse_tray lwt on lwt.id = lwtt.tray_id
where 1=1
and lwtt.is_deleted = 0
and lwtt.type = #{param.type}

22
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java
Unescape View File

@ -84,6 +84,9 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
for (WarehouseTrayTypeVO warehouseTrayTypeVO:records){
String value = DictBizCache.getValue(DictBizConstant.PALLET_ORDER_TYPE, warehouseTrayTypeVO.getTrayType());
warehouseTrayTypeVO.setTrayTypeName(value);
String trayCode = warehouseTrayTypeVO.getTrayCode();
BasicdataTrayEntity trayEntity = basicdataTrayClient.getTrayByTrayCode(trayCode);
warehouseTrayTypeVO.setTrayName(trayEntity.getPalletName());
}
warehouseTrayTypeVOIPage.setRecords(records);
@ -144,6 +147,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
trayTypeDataVO.setTrayTypeId(trayTypeId);
trayTypeDataVO.setType(type);
trayTypeDataVO.setTrayCode(trayTypeEntity.getTrayCode());
trayTypeDataVO.setTrayName(basicdataTrayEntity.getPalletName());
trayTypeDataVO.setTrayNum(trayTypeEntity.getTotalNum());
trayTypeDataVO.setName(trayTypeEntity.getFilterValue());
trayTypeDataVO.setOrderTotalNum(trayTypeEntity.getOrderTotalNum());
@ -217,6 +221,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
trayTypeDataVO.setTrayTypeId(trayTypeId);
trayTypeDataVO.setType(type);
trayTypeDataVO.setTrayCode(trayTypeEntity.getTrayCode());
trayTypeDataVO.setTrayName(basicdataTrayEntity.getPalletName());
trayTypeDataVO.setTrayNum(trayTypeEntity.getTotalNum());
trayTypeDataVO.setName(trayTypeEntity.getFilterValue());
trayTypeDataVO.setOrderTotalNum(trayTypeEntity.getOrderTotalNum());
@ -846,6 +851,9 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
for (WarehouseTrayTypeVO warehouseTrayTypeVO:records){
String value = DictBizCache.getValue(DictBizConstant.PALLET_ZERO_TYPE, warehouseTrayTypeVO.getTrayType());
warehouseTrayTypeVO.setTrayTypeName(value);
String trayCode = warehouseTrayTypeVO.getTrayCode();
BasicdataTrayEntity trayEntity = basicdataTrayClient.getTrayByTrayCode(trayCode);
warehouseTrayTypeVO.setTrayName(trayEntity.getPalletName());
}
warehouseTrayTypeVOIPage.setRecords(records);
return warehouseTrayTypeVOIPage;
@ -1308,6 +1316,9 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
for (WarehouseTrayTypeVO warehouseTrayTypeVO:records){
String palletTypeName = DictBizCache.getValue(DictBizConstant.PALLET_STOCK_TYPE, warehouseTrayTypeVO.getTrayType());
warehouseTrayTypeVO.setTrayTypeName(palletTypeName);
String trayCode = warehouseTrayTypeVO.getTrayCode();
BasicdataTrayEntity trayEntity = basicdataTrayClient.getTrayByTrayCode(trayCode);
warehouseTrayTypeVO.setTrayName(trayEntity.getPalletName());
}
warehouseTrayTypeVOIPage.setRecords(records);
return warehouseTrayTypeVOIPage;
@ -1829,6 +1840,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
return R.fail(403,"托盘信息不存在");
}
Integer disableType = trayEntity.getDisableType();
String palletName = trayEntity.getPalletName();
Long trayId = trayEntity.getId();
if(disableType == 2){
log.warn("################scanSourceTrayCode: 托盘已禁用 trayCode={}",trayCode);
@ -1887,6 +1899,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
// log.warn("##################getEntityByTrayCode: 未知的打托类型");
// }
map.put("trayCode",trayCode);
map.put("trayName",palletName);
map.put("totalNum",totalNum);
map.put("orderTotalNum",orderTotalNum);
map.put("stockNum",stockNum);
@ -2075,6 +2088,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
return R.fail(403,"托盘信息不存在");
}
Integer disableType = trayEntity.getDisableType();
String palletName = trayEntity.getPalletName();
Long trayId = trayEntity.getId();
if(disableType == 2){
log.warn("################scanTargetTrayCode: 托盘已禁用 trayCode={}",trayCode);
@ -2131,6 +2145,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
// log.warn("##################scanTargetTrayCode: 未知的打托类型");
// }
map.put("trayCode",trayCode);
map.put("trayName",palletName);
map.put("totalNum",totalNum);
map.put("orderTotalNum",orderTotalNum);
map.put("stockNum",stockNum);
@ -2144,7 +2159,13 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
public R moveTrayScanTrayCode(String trayCode,Long warehouseId) {
BasicdataTrayEntity basicdataTrayEntity = basicdataTrayClient.getTrayByTrayCode(trayCode);
if(Objects.isNull(basicdataTrayEntity)){
log.warn("###############moveTrayScanTrayCode: 托盘信息不存在 trayCode={}",trayCode);
throw new CustomerException(403,"托盘信息不存在");
}
Integer disableType = basicdataTrayEntity.getDisableType();
String palletName = basicdataTrayEntity.getPalletName();
if(disableType == 2){
log.warn("###############moveTrayScanTrayCode: 该托盘已被禁用 trayCode={}",trayCode);
throw new CustomerException(403,"该托盘已被禁用");
@ -2182,6 +2203,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
trayTypeDataVO.setTrayTypeId(trayTypeId);
trayTypeDataVO.setType(type);
trayTypeDataVO.setTrayCode(trayTypeEntity.getTrayCode());
trayTypeDataVO.setTrayName(palletName);
trayTypeDataVO.setTrayNum(trayTypeEntity.getTotalNum());
trayTypeDataVO.setName(trayTypeEntity.getFilterValue());
trayTypeDataVO.setOrderTotalNum(trayTypeEntity.getOrderTotalNum());

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

@ -380,8 +380,10 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
//有托盘就查询托盘上的数据
Long trayId = basicdataTrayEntity.getId();
String trayCode = basicdataTrayEntity.getPalletCode();
String palletName = basicdataTrayEntity.getPalletName();
upShelfAllocationVO.setTrayId(trayId);
upShelfAllocationVO.setTrayCode(trayCode);
upShelfAllocationVO.setTrayName(palletName);
QueryWrapper<WarehouseTrayTypeEntity> trayTypeEntityQueryWrapper = new QueryWrapper<>();
trayTypeEntityQueryWrapper.eq("tray_id",trayId)
.eq("is_deleted",0);
@ -1570,6 +1572,7 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
upShelfAllocationVO.setAllocationTitle(goodsAllocationEntity.getGoodsAllocationName());
upShelfAllocationVO.setTrayId(trayTypeEntity.getTrayId());
upShelfAllocationVO.setTrayCode(trayTypeEntity.getTrayCode());
upShelfAllocationVO.setTrayName(trayEntity.getPalletName());
Long trayTypeId = trayTypeEntity.getId();//打托方式id
String type = trayTypeEntity.getType();//打托分类

Write Preview
Loading…
Cancel
Save