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

1.清洗托盘打托数据 

2.关闭卸分一体打托
single_db
zhenghaoyu 1 year ago
parent
66b048b22a
commit
33a8c2208a
6 changed files with 255 additions and 8 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. 5
      blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/FactoryCommonServiceImpl.java
  2. 91
      blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncWarehouseData.java
  3. 21
      blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.java
  4. 75
      blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.xml
  5. 20
      blade-service/logpm-patch/src/main/java/com/logpm/patch/service/IWarehouseMappingDataService.java
  6. 51
      blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/WarehouseMappingDataServiceImpl.java

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

@ -19,14 +19,11 @@ import com.logpm.warehouse.feign.IWarehouseTrayTypeClient;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springblade.common.constant.OldSystemDataPushConfig;
import org.springblade.common.constant.RedisKeyConstant;
import org.springblade.common.exception.CustomerException;
import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.tool.utils.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.sql.Wrapper;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -168,7 +165,7 @@ public class FactoryCommonServiceImpl implements IFactoryCommonService {
}
//同步打托数据
syncTrayTypeData(unitNo, trayId, currentWarehouseId);
// syncTrayTypeData(unitNo, trayId, currentWarehouseId);
} catch (Exception e) {
log.error(e.getMessage());

91
blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncWarehouseData.java
Unescape View File

@ -1,5 +1,6 @@
package com.logpm.patch.jobhandle;
import cn.hutool.json.JSONObject;
import com.logpm.basicdata.entity.BasicdataGoodsAllocationEntity;
import com.logpm.basicdata.entity.BasicdataGoodsAreaEntity;
import com.logpm.basicdata.entity.BasicdataGoodsShelfEntity;
@ -9,6 +10,7 @@ import com.logpm.oldproject.entity.CargoEntity;
import com.logpm.oldproject.entity.LocationEntity;
import com.logpm.oldproject.entity.ShelfEntity;
import com.logpm.oldproject.feign.*;
import com.logpm.patch.service.IWarehouseMappingDataService;
import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.job.core.handler.annotation.XxlJob;
import lombok.AllArgsConstructor;
@ -16,10 +18,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springblade.core.tool.utils.StringUtil;
import org.springframework.stereotype.Component;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.*;
@Slf4j
@AllArgsConstructor
@ -40,6 +39,9 @@ public class SyncWarehouseData {
private final ILocationClient locationClient;//货位
private final ITrayClient trayClient;//托盘
private final IWarehouseMappingDataService warehouseMappingDataService;
@XxlJob("syncAllocationInfo")
public ReturnT<String> syncAllocationInfo(String param) {
log.info("####################syncAllocationInfo: 同步库位信息开始");
@ -173,6 +175,87 @@ public class SyncWarehouseData {
return true;
}
@XxlJob("clearTrayAndAllocationData")
public ReturnT<String> clearTrayAndAllocationData(String param) {
log.info("####################clearTrayAndAllocationData: 清洗托盘库位信息开始");
//查询托盘 包条重复的信息
List<JSONObject> ls = new ArrayList<>();
if(!StringUtil.isBlank(param)){
JSONObject jsonObject = new JSONObject();
jsonObject.set("orderPackageCode",param);
ls.add(jsonObject);
}else{
ls = warehouseMappingDataService.findDoubleDataAll();
}
for (JSONObject jsonObject : ls) {
String orderPackageCode = jsonObject.getStr("orderPackageCode");
//查询重复的托盘数据
JSONObject doubleData = warehouseMappingDataService.findDoubleInfoListByOrderPackageCode(orderPackageCode);
Long trayGoodsId = doubleData.getLong("trayGoodsId");
Long trayTypeId = doubleData.getLong("trayTypeId");
Long trayId = doubleData.getLong("trayId");
//删除托盘指定数据
warehouseMappingDataService.deleteTrayGoodsById(trayGoodsId);
//更新打托数据
warehouseMappingDataService.updateTrayTypeById(trayTypeId);
//判断有没有上架
Long allocationId = warehouseMappingDataService.findAllocationIdByTrayId(trayId);
if(!Objects.isNull(allocationId)){
//查询有几条数据
List<JSONObject> updownDoubleDataList = warehouseMappingDataService.findUpdownDoubleDataList(orderPackageCode,allocationId);
int size = updownDoubleDataList.size();
if(size > 1){
JSONObject jo = updownDoubleDataList.get(0);
Long updownGoodsId = jo.getLong("updownGoodsId");
Long updownTypeId = jo.getLong("updownTypeId");
//删除updownGoods
warehouseMappingDataService.deleteUpdownGoodsById(updownGoodsId);
//更新上架方式数量
warehouseMappingDataService.updateUpdownTypeById(updownTypeId);
}
}
}
return ReturnT.SUCCESS;
}
@XxlJob("clearAllocationData")
public ReturnT<String> clearAllocationData(String param) {
log.info("####################clearAllocationData: 清洗库位信息开始");
//查询托盘 包条重复的信息
List<JSONObject> ls = new ArrayList<>();
if(!StringUtil.isBlank(param)){
JSONObject jsonObject = new JSONObject();
jsonObject.set("orderPackageCode",param);
ls.add(jsonObject);
}else{
ls = warehouseMappingDataService.findAllocationDoubleDataAll();
}
for (JSONObject jsonObject : ls) {
String orderPackageCode = jsonObject.getStr("orderPackageCode");
//查询重复的托盘数据
JSONObject doubleData = warehouseMappingDataService.findAllocationDoubleInfoListByOrderPackageCode(orderPackageCode);
Long updownGoodsId = doubleData.getLong("updownGoodsId");
Long updownTypeId = doubleData.getLong("updownTypeId");
//删除updownGoods
warehouseMappingDataService.deleteUpdownGoodsById(updownGoodsId);
//更新上架方式数量
warehouseMappingDataService.updateUpdownTypeById(updownTypeId);
}
return ReturnT.SUCCESS;
}
}

21
blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.java
Unescape View File

@ -1,7 +1,9 @@
package com.logpm.patch.mapper;
import cn.hutool.json.JSONObject;
import com.logpm.patch.entity.WarehouseMappingDataEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@ -11,4 +13,23 @@ public interface WarehouseMappingDataMapper {
List<WarehouseMappingDataEntity> getWarehouseMapping();
List<JSONObject> findDoubleDataAll();
JSONObject findDoubleInfoListByOrderPackageCode(@Param("orderPackageCode") String orderPackageCode);
void deleteTrayGoodsById(@Param("trayGoodsId") Long trayGoodsId);
void updateTrayTypeById(@Param("trayTypeId") Long trayTypeId);
Long findAllocationIdByTrayId(@Param("trayId") Long trayId);
List<JSONObject> findUpdownDoubleDataList(@Param("orderPackageCode") String orderPackageCode, @Param("allocationId") Long allocationId);
void deleteUpdownGoodsById(@Param("updownGoodsId") Long updownGoodsId);
void updateUpdownTypeById(@Param("updownTypeId") Long updownTypeId);
List<JSONObject> findAllocationDoubleDataAll();
JSONObject findAllocationDoubleInfoListByOrderPackageCode(@Param("orderPackageCode") String orderPackageCode);
}

75
blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.xml
Unescape View File

@ -8,4 +8,79 @@
from warehouse_mapping_data
</select>
<select id="findDoubleDataAll" resultType="cn.hutool.json.JSONObject">
select lwtg.association_value orderPackageCode,
count(lwtg.id) num
from logpm_warehouse_tray_goods lwtg
where lwtg.association_type = 3
group by lwtg.association_value
HAVING count(lwtg.id) > 1
</select>
<select id="findDoubleInfoListByOrderPackageCode" resultType="cn.hutool.json.JSONObject">
select id trayGoodsId,
tray_type_id trayTypeId,
tray_id trayId
from logpm_warehouse_tray_goods lwtg
where lwtg.association_value = #{orderPackageCode}
order by lwtg.create_time asc
limit 1
</select>
<delete id="deleteTrayGoodsById">
delete from logpm_warehouse_tray_goods
where id = #{trayGoodsId}
</delete>
<update id="updateTrayTypeById" >
update logpm_warehouse_tray_type
set total_num = total_num - 1
where id = #{trayTypeId}
</update>
<select id="findAllocationIdByTrayId" resultType="Long">
select allocation_id
from logpm_warehouse_tary_allocation
where tray_id = #{trayId}
and is_deleted = 0
</select>
<select id="findUpdownDoubleDataList" resultType="cn.hutool.json.JSONObject">
select id updownGoodsId,
updown_type_id updownTypeId
from logpm_warehouse_updown_goods
where allocation_id = #{allocationId}
and association_value = #{orderPackageCode}
order by create_time asc
</select>
<delete id="deleteUpdownGoodsById" >
delete from logpm_warehouse_updown_goods
where id = #{updownGoodsId}
</delete>
<update id="updateUpdownTypeById">
update logpm_warehouse_updown_type
set total_num = total_num - 1
where id = #{updownTypeId}
</update>
<select id="findAllocationDoubleDataAll" resultType="cn.hutool.json.JSONObject">
select lwtg.association_value orderPackageCode,
count(lwtg.id) num
from logpm_warehouse_updown_goods lwtg
where lwtg.association_type = 3
group by lwtg.association_value
HAVING count(lwtg.id) > 1
</select>
<select id="findAllocationDoubleInfoListByOrderPackageCode" resultType="cn.hutool.json.JSONObject">
select id updownGoodsId,
updown_type_id updownTypeId
from logpm_warehouse_updown_goods
where association_value = #{orderPackageCode}
order by create_time asc
limit 1
</select>
</mapper>

20
blade-service/logpm-patch/src/main/java/com/logpm/patch/service/IWarehouseMappingDataService.java
Unescape View File

@ -1,5 +1,6 @@
package com.logpm.patch.service;
import cn.hutool.json.JSONObject;
import com.logpm.patch.entity.WarehouseMappingDataEntity;
import java.util.List;
@ -8,4 +9,23 @@ public interface IWarehouseMappingDataService {
List<WarehouseMappingDataEntity> getWarehouseMapping();
List<JSONObject> findDoubleDataAll();
JSONObject findDoubleInfoListByOrderPackageCode(String orderPackageCode);
void deleteTrayGoodsById(Long trayGoodsId);
void updateTrayTypeById(Long trayTypeId);
Long findAllocationIdByTrayId(Long trayId);
List<JSONObject> findUpdownDoubleDataList(String orderPackageCode, Long allocationId);
void deleteUpdownGoodsById(Long updownGoodsId);
void updateUpdownTypeById(Long updownTypeId);
List<JSONObject> findAllocationDoubleDataAll();
JSONObject findAllocationDoubleInfoListByOrderPackageCode(String orderPackageCode);
}

51
blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/WarehouseMappingDataServiceImpl.java
Unescape View File

@ -1,5 +1,6 @@
package com.logpm.patch.service.impl;
import cn.hutool.json.JSONObject;
import com.logpm.patch.entity.WarehouseMappingDataEntity;
import com.logpm.patch.mapper.WarehouseMappingDataMapper;
import com.logpm.patch.service.IWarehouseMappingDataService;
@ -20,4 +21,54 @@ public class WarehouseMappingDataServiceImpl implements IWarehouseMappingDataSer
public List<WarehouseMappingDataEntity> getWarehouseMapping() {
return warehouseMappingDataMapper.getWarehouseMapping();
}
@Override
public List<JSONObject> findDoubleDataAll() {
return warehouseMappingDataMapper.findDoubleDataAll();
}
@Override
public JSONObject findDoubleInfoListByOrderPackageCode(String orderPackageCode) {
return warehouseMappingDataMapper.findDoubleInfoListByOrderPackageCode(orderPackageCode);
}
@Override
public void deleteTrayGoodsById(Long trayGoodsId) {
warehouseMappingDataMapper.deleteTrayGoodsById(trayGoodsId);
}
@Override
public void updateTrayTypeById(Long trayTypeId) {
warehouseMappingDataMapper.updateTrayTypeById(trayTypeId);
}
@Override
public Long findAllocationIdByTrayId(Long trayId) {
return warehouseMappingDataMapper.findAllocationIdByTrayId(trayId);
}
@Override
public List<JSONObject> findUpdownDoubleDataList(String orderPackageCode, Long allocationId) {
return warehouseMappingDataMapper.findUpdownDoubleDataList(orderPackageCode,allocationId);
}
@Override
public void deleteUpdownGoodsById(Long updownGoodsId) {
warehouseMappingDataMapper.deleteUpdownGoodsById(updownGoodsId);
}
@Override
public void updateUpdownTypeById(Long updownTypeId) {
warehouseMappingDataMapper.updateUpdownTypeById(updownTypeId);
}
@Override
public List<JSONObject> findAllocationDoubleDataAll() {
return warehouseMappingDataMapper.findAllocationDoubleDataAll();
}
@Override
public JSONObject findAllocationDoubleInfoListByOrderPackageCode(String orderPackageCode) {
return warehouseMappingDataMapper.findAllocationDoubleInfoListByOrderPackageCode(orderPackageCode);
}
}

Write Preview
Loading…
Cancel
Save