Browse Source

Merge branch 'dev' into pre-production

master
pref_mail@163.com 10 months ago
parent
commit
5b61367bc0
  1. 2
      blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java
  2. 10
      blade-biz-common/src/main/java/org/springblade/common/constant/RabbitConstant.java
  3. 4
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryDetailsMapper.xml
  4. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml
  5. 1
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
  6. 155
      blade-service/logpm-patch/src/main/java/com/logpm/patch/config/CustomMessageConverter.java
  7. 1
      blade-service/logpm-patch/src/main/java/com/logpm/patch/config/RabbitMqConfiguration.java
  8. 23
      blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncOldTrayTypeData.java
  9. 38
      blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncOrderInfoToPlatform.java
  10. 12
      blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.java
  11. 43
      blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.xml
  12. 13
      blade-service/logpm-patch/src/main/java/com/logpm/patch/service/IWarehouseMappingDataService.java
  13. 30
      blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/WarehouseMappingDataServiceImpl.java
  14. 3
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/OldSystemPushController.java
  15. 4
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownTypeMapper.java
  16. 12
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownTypeMapper.xml
  17. 65
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/receiver/OldTrayTypeListener.java
  18. 4
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownTypeService.java
  19. 5
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java
  20. 10
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java

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

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

10
blade-biz-common/src/main/java/org/springblade/common/constant/RabbitConstant.java

@ -216,4 +216,14 @@ public interface RabbitConstant {
/****************商家入库完结 end *************************/
/****************老系统推送打托数据 start *************************/
String OLD_TRAY_TYPE_QUEUE = "old_tray_type_queue" + ModuleNameConstant.DEVAUTH;
String OLD_TRAY_TYPE_EXCHANGE = "old_tray_type_exchange" + ModuleNameConstant.DEVAUTH;
String OLD_TRAY_TYPE_ROUTING = "old_tray_type_routing" + ModuleNameConstant.DEVAUTH;
/****************老系统推送打托数据 start *************************/
}

4
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryDetailsMapper.xml

@ -95,7 +95,9 @@
ldsl.tray_name trayName, lds.allocation_title allocation,
lddd.reality_quantity preparedQuantity,
lddd.stock_status,
(SELECT count(id) FROM logpm_distribution_bill_lading_scan ldbls WHERE ldbls.stock_list_id = lddd.stock_list_id and ldbls.material_type = 1 and ldbls.scan_type=2) AS pick_up_quantity,
(SELECT count(id) FROM logpm_distribution_bill_lading_scan ldbls WHERE ldbls.stock_list_id = lddd.stock_list_id and ldbls.material_type = 1 and
ldbls.bill_lading_id=#{param.billLadingId}
) AS pick_up_quantity,
CASE
WHEN ( SELECT count( id ) FROM logpm_distribution_bill_lading_scan ldbls WHERE ldbls.stock_list_id = lddd.stock_list_id AND ldbls.material_type = 1 ) = 0 THEN

2
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml

@ -799,7 +799,7 @@ FROM
LEFT JOIN logpm_distribution_stockup AS ldss ON ldsi.stockup_id = ldss.id
WHERE
ldsi.reservation_id = lds.reservation_id and
ldsi.stock_status != '4'
AND ldsi.stock_status != '4'
) AS forkliftName,
CASE
WHEN ldr.stockup_status ='10' THEN '待指派'

1
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java

@ -3138,6 +3138,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
List<DistributionParcelListEntity> list1 = distributionParcelListService.list(Wrappers.<DistributionParcelListEntity>query().lambda()
.in(DistributionParcelListEntity::getStockArticleId, ls)
.eq(DistributionParcelListEntity::getConditions, 1)
);

155
blade-service/logpm-patch/src/main/java/com/logpm/patch/config/CustomMessageConverter.java

@ -0,0 +1,155 @@
package com.logpm.patch.config;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.ThreadLocalUtil;
import org.springframework.amqp.core.Message;
import org.springframework.amqp.core.MessageProperties;
import org.springframework.amqp.support.converter.AllowedListDeserializingMessageConverter;
import org.springframework.amqp.support.converter.MessageConversionException;
import org.springframework.amqp.utils.SerializationUtils;
import org.springframework.beans.factory.BeanClassLoaderAware;
import org.springframework.http.HttpHeaders;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.remoting.rmi.CodebaseAwareObjectInputStream;
import org.springframework.stereotype.Component;
import org.springframework.util.ClassUtils;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import java.io.*;
import java.util.List;
import java.util.Map;
/**
* @author zhaoqiaobo
* @create 2024-05-08
*/
@Component
public class CustomMessageConverter extends AllowedListDeserializingMessageConverter implements BeanClassLoaderAware {
private volatile String defaultCharset = "UTF-8";
private ClassLoader beanClassLoader = ClassUtils.getDefaultClassLoader();
private String codebaseUrl;
@Deprecated
public void setCodebaseUrl(String codebaseUrl) {
this.codebaseUrl = codebaseUrl;
}
@Override
public Object fromMessage(Message message) throws MessageConversionException {
Object content = null;
MessageProperties properties = message.getMessageProperties();
if (properties != null) {
String contentType = properties.getContentType();
if (contentType != null && contentType.startsWith("text")) {
String encoding = properties.getContentEncoding();
if (encoding == null) {
encoding = "UTF-8";
}
try {
content = new String(message.getBody(), encoding);
} catch (UnsupportedEncodingException var8) {
throw new MessageConversionException("failed to convert text-based Message content", var8);
}
} else if (contentType != null && contentType.equals("application/x-java-serialized-object")) {
try {
content = SerializationUtils.deserialize(this.createObjectInputStream(new ByteArrayInputStream(message.getBody()), this.codebaseUrl));
} catch (IllegalArgumentException | IllegalStateException | IOException var7) {
throw new MessageConversionException("failed to convert serialized Message content", var7);
}
}
}
Map<String, Object> headers = properties.getHeaders();
HttpHeaders httpHeaders = new HttpHeaders();
for (Map.Entry<String, Object> entry : headers.entrySet()) {
if (StrUtil.equals("Blade-Auth", entry.getKey())
|| StrUtil.equals("Authorization", entry.getKey())
|| StrUtil.equals("blade-auth", entry.getKey())
|| StrUtil.equals("authorization", entry.getKey())) {
List value = (List) entry.getValue();
for (Object o : value) {
httpHeaders.add(entry.getKey(), String.valueOf(o));
}
}
}
ThreadLocalUtil.put("bladeContext", httpHeaders);
Object bladeUser = headers.get("bladeUser");
MockHttpServletRequest request = new MockHttpServletRequest();
BladeUser bladeUser1 = JSONUtil.toBean(bladeUser.toString(), BladeUser.class);
request.setAttribute("_BLADE_USER_REQUEST_ATTR_", bladeUser1);
RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request));
if (content == null) {
content = message.getBody();
}
return content;
}
@Override
protected Message createMessage(Object object, MessageProperties messageProperties) throws MessageConversionException {
byte[] bytes = null;
if (object instanceof byte[]) {
bytes = (byte[]) object;
messageProperties.setContentType("application/octet-stream");
} else if (object instanceof String) {
try {
bytes = ((String) object).getBytes(this.defaultCharset);
} catch (UnsupportedEncodingException var6) {
throw new MessageConversionException("failed to convert to Message content", var6);
}
messageProperties.setContentType("text/plain");
messageProperties.setContentEncoding(this.defaultCharset);
} else if (object instanceof Serializable) {
try {
bytes = SerializationUtils.serialize(object);
} catch (IllegalArgumentException var5) {
throw new MessageConversionException("failed to convert to serialized Message content", var5);
}
messageProperties.setContentType("application/x-java-serialized-object");
}
HttpHeaders headers = (HttpHeaders) ThreadLocalUtil.get("bladeContext");
if (headers != null && !headers.isEmpty()) {
headers.forEach((key, values) -> {
values.forEach((value) -> {
messageProperties.setHeader(key, new String[]{value});
});
});
}
BladeUser user = AuthUtil.getUser();
BladeUser bladeUser = new BladeUser();
bladeUser.setTenantId(user.getTenantId());
bladeUser.setUserId(user.getUserId());
bladeUser.setAccount(user.getAccount());
bladeUser.setRoleId(user.getRoleId());
messageProperties.setHeader("bladeUser", JSONUtil.toJsonStr(bladeUser));
if (bytes != null) {
messageProperties.setContentLength((long) bytes.length);
return new Message(bytes, messageProperties);
} else {
throw new IllegalArgumentException(this.getClass().getSimpleName() + " only supports String, byte[] and Serializable payloads, received: " + object.getClass().getName());
}
}
@Override
public void setBeanClassLoader(ClassLoader classLoader) {
this.beanClassLoader = beanClassLoader;
}
protected ObjectInputStream createObjectInputStream(InputStream is, String codebaseUrl) throws IOException {
return new CodebaseAwareObjectInputStream(is, this.beanClassLoader, codebaseUrl) {
@Override
protected Class<?> resolveClass(ObjectStreamClass classDesc) throws IOException, ClassNotFoundException {
Class<?> clazz = super.resolveClass(classDesc);
CustomMessageConverter.this.checkAllowedList(clazz);
return clazz;
}
};
}
}

1
blade-service/logpm-patch/src/main/java/com/logpm/patch/config/RabbitMqConfiguration.java

@ -26,6 +26,7 @@ public class RabbitMqConfiguration {
RabbitTemplate template = new RabbitTemplate();
template.setConnectionFactory(connectionFactory);
template.setMandatory(true);
template.setMessageConverter(new CustomMessageConverter());
template.setConfirmCallback(new RabbitTemplate.ConfirmCallback() {
@Override
public void confirm(CorrelationData correlationData, boolean b, String s) {

23
blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncOldTrayTypeData.java

@ -8,7 +8,8 @@ import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.job.core.handler.annotation.XxlJob;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.tool.api.R;
import org.springblade.common.constant.RabbitConstant;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.stereotype.Component;
import java.util.List;
@ -21,7 +22,7 @@ public class SyncOldTrayTypeData {
private final IOldTrayTypeService oldTrayTypeService;
private final ISyncOldTrayTypeClient syncOldTrayTypeClient;
private final RabbitTemplate rabbitTemplate;
@XxlJob("syncOldTrayTypeInfo")
public ReturnT<String> syncOldTrayTypeInfo(String param) {
@ -43,13 +44,17 @@ public class SyncOldTrayTypeData {
Integer trayId = jsonObject.getInteger("trayId");
Integer oldWarehouseId = jsonObject.getInteger("warehouseId");
R r = syncOldTrayTypeClient.budaOldTrayTypeData(orderPackageCode, trayId, type, oldWarehouseId);
int code = r.getCode();
if(200 == code){
oldTrayTypeService.updateSyncStatus(id,1);
}else{
oldTrayTypeService.updateSyncNum(id,syncNum+1);
}
jsonObject.put("oldTrayTypeId",id);
rabbitTemplate.convertAndSend(RabbitConstant.OLD_TRAY_TYPE_EXCHANGE,RabbitConstant.OLD_TRAY_TYPE_ROUTING, jsonObject.toJSONString());
// R r = syncOldTrayTypeClient.budaOldTrayTypeData(orderPackageCode, trayId, type, oldWarehouseId);
// int code = r.getCode();
// if(200 == code){
// oldTrayTypeService.updateSyncStatus(id,1);
// }else{
// oldTrayTypeService.updateSyncNum(id,syncNum+1);
// }
}
return ReturnT.SUCCESS;

38
blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncOrderInfoToPlatform.java

@ -795,4 +795,42 @@ public class SyncOrderInfoToPlatform {
}
@XxlJob("clearTrayTypeInfo")
public ReturnT<String> clearTrayTypeInfo(String param) {
log.info("############clearTrayTypeInfo: 处理托盘重复数据 开始");
List<String> trayCodes = new ArrayList<>();
if(StringUtil.isBlank(param)){
trayCodes = warehouseMappingDataService.findExceptionTrayType();
}else{
if(param.contains(",")){
String[] split = param.split(",");
trayCodes.addAll(Arrays.asList(split));
}else{
trayCodes.add(param);
}
}
trayCodes.forEach(trayCode -> {
List<Long> trayTypeIds = warehouseMappingDataService.findMoreTrayTypeIds(trayCode);
Long aLong = trayTypeIds.get(0);
trayTypeIds.remove(aLong);
warehouseMappingDataService.updateTrayTypeId(aLong,trayCode);
warehouseMappingDataService.updateTrayTypeDeleted(trayTypeIds);
Integer num = warehouseMappingDataService.findTrayTypeNum(trayCode);
warehouseMappingDataService.updateTrayTypeNum(num,aLong);
});
log.info("############clearTrayTypeInfo: 处理托盘重复数据 完成");
return ReturnT.SUCCESS;
}
}

12
blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.java

@ -97,5 +97,17 @@ public interface WarehouseMappingDataMapper {
void updateClearBillSignforStatus(@Param("singnforId") Long singnforId, @Param("warehouseId") Long warehouseId, @Param("dealStatus") Integer dealStatus);
List<JSONObject> findAllBillSign(@Param("id") Integer id);
List<String> findExceptionTrayType();
List<Long> findMoreTrayTypeIds(@Param("trayCode") String trayCode);
void updateTrayTypeId(@Param("aLong") Long aLong, @Param("trayCode") String trayCode);
void updateTrayTypeDeleted(@Param("trayTypeIds") List<Long> trayTypeIds);
Integer findTrayTypeNum(@Param("trayCode") String trayCode);
void updateTrayTypeNum(@Param("num") Integer num, @Param("aLong") Long aLong);
}

43
blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.xml

@ -306,4 +306,47 @@
and warehouse_id = #{warehouseId}
</update>
<select id="findExceptionTrayType" resultType="String">
select tray_code
from logpm_warehouse_tray_type
where is_deleted = 0
group by tray_code
HAVING count(id) > 1
</select>
<select id="findMoreTrayTypeIds" resultType="Long">
select id
from logpm_warehouse_tray_type
where tray_code = #{trayCode}
and is_deleted = 0
</select>
<update id="updateTrayTypeId" >
update logpm_warehouse_tray_goods
set tray_type_id = #{trayTypeId}
where tray_code = #{trayCode}
and is_deleted = 0
</update>
<update id="updateTrayTypeDeleted" >
update logpm_warehouse_tray_type
set is_deleted = 1
where id in
<foreach collection="trayTypeIds" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</update>
<select id="findTrayTypeNum" resultType="int">
select count(id)
from logpm_warehouse_tray_goods
where tray_code = #{trayCode}
</select>
<update id="updateTrayTypeNum" >
update logpm_warehouse_tray_type
set num = #{num}
where id = #{aLong}
</update>
</mapper>

13
blade-service/logpm-patch/src/main/java/com/logpm/patch/service/IWarehouseMappingDataService.java

@ -87,4 +87,17 @@ public interface IWarehouseMappingDataService {
List<JSONObject> findPackageUpdownData();
void updatePackageUpdownStatus(Integer id, Integer syncStatus);
List<String> findExceptionTrayType();
List<Long> findMoreTrayTypeIds(String trayCode);
void updateTrayTypeId(Long aLong,String trayCode);
void updateTrayTypeDeleted(List<Long> trayTypeIds);
Integer findTrayTypeNum(String trayCode);
void updateTrayTypeNum(Integer num, Long aLong);
}

30
blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/WarehouseMappingDataServiceImpl.java

@ -205,4 +205,34 @@ public class WarehouseMappingDataServiceImpl implements IWarehouseMappingDataSer
public void updatePackageUpdownStatus(Integer id, Integer syncStatus) {
warehouseMappingDataMapper.updatePackageUpdownStatus(id,syncStatus);
}
@Override
public List<String> findExceptionTrayType() {
return warehouseMappingDataMapper.findExceptionTrayType();
}
@Override
public List<Long> findMoreTrayTypeIds(String trayCode) {
return warehouseMappingDataMapper.findMoreTrayTypeIds(trayCode);
}
@Override
public void updateTrayTypeId(Long aLong,String trayCode) {
warehouseMappingDataMapper.updateTrayTypeId(aLong,trayCode);
}
@Override
public void updateTrayTypeDeleted(List<Long> trayTypeIds) {
warehouseMappingDataMapper.updateTrayTypeDeleted(trayTypeIds);
}
@Override
public Integer findTrayTypeNum(String trayCode) {
return warehouseMappingDataMapper.findTrayTypeNum(trayCode);
}
@Override
public void updateTrayTypeNum(Integer num, Long aLong) {
warehouseMappingDataMapper.updateTrayTypeNum(num,aLong);
}
}

3
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/OldSystemPushController.java

@ -185,7 +185,8 @@ public class OldSystemPushController {
warehouseLog.setType(3);
warehouseLogService.save(warehouseLog);
asyncDataService.sendTrayInfoByOrderPackageCode(trayInfoDTO);
rabbitTemplate.convertAndSend(RabbitConstant.OLD_TRAY_TYPE_EXCHANGE,RabbitConstant.OLD_TRAY_TYPE_ROUTING, JSONObject.toJSONString(trayInfoDTO));
// asyncDataService.sendTrayInfoByOrderPackageCode(trayInfoDTO);
warehouseLog.setStatus(1);
warehouseLogService.updateById(warehouseLog);

4
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownTypeMapper.java

@ -25,4 +25,8 @@ public interface WarehouseUpdownTypeMapper extends BaseMapper<WarehouseUpdownTyp
void updateStockByUpdownTypeId(@Param("orderTotalNum") Integer orderTotalNum, @Param("enterNum") Integer enterNum, @Param("updownTypeId") Long updownTypeId);
List<GoodsVO> selectStockListByUpdownTypeId(@Param("updownTypeId") Long updownTypeId);
void updateOldTrayTypeInfo(@Param("oldTrayTypeId") Long oldTrayTypeId, @Param("status") int status);
void updateOldTrayTypeInfoNum(@Param("oldTrayTypeId") Long oldTrayTypeId);
}

12
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownTypeMapper.xml

@ -78,4 +78,16 @@
</update>
<update id="updateOldTrayTypeInfo" >
update sync_old_tray_type_log
set sync_status = #{status}
where id = #{oldTrayTypeId}
</update>
<update id="updateOldTrayTypeInfoNum" >
update sync_old_tray_type_log
set sync_num = sync_num + 1
where id = #{oldTrayTypeId}
</update>
</mapper>

65
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/receiver/OldTrayTypeListener.java

@ -0,0 +1,65 @@
package com.logpm.warehouse.receiver;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.logpm.warehouse.dto.TrayInfoDTO;
import com.logpm.warehouse.service.IWarehouseUpdownTypeService;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springblade.common.constant.RabbitConstant;
import org.springframework.amqp.core.ExchangeTypes;
import org.springframework.amqp.rabbit.annotation.Exchange;
import org.springframework.amqp.rabbit.annotation.Queue;
import org.springframework.amqp.rabbit.annotation.QueueBinding;
import org.springframework.amqp.rabbit.annotation.RabbitListener;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import java.util.Objects;
@Slf4j
@Component
@AllArgsConstructor
public class OldTrayTypeListener {
private final IWarehouseUpdownTypeService warehouseUpdownTypeService;
@RabbitListener(bindings = @QueueBinding(
value = @Queue(name = RabbitConstant.OLD_TRAY_TYPE_QUEUE),
exchange = @Exchange(name = RabbitConstant.OLD_TRAY_TYPE_EXCHANGE, type = ExchangeTypes.DIRECT),
key = RabbitConstant.OLD_TRAY_TYPE_ROUTING
))
@Transactional(rollbackFor = Exception.class)
public void oldTrayTypeInfo(String msg) {
JSONObject jsonObject = JSONUtil.parseObj(msg);
String orderPackageCode = jsonObject.getStr("orderPackageCode");
Integer type = jsonObject.getInt("type");
Integer trayId = jsonObject.getInt("trayId");
Integer oldWarehouseId = jsonObject.getInt("warehouseId");
Long oldTrayTypeId = jsonObject.getLong("oldTrayTypeId");
TrayInfoDTO trayInfoDTO = new TrayInfoDTO();
trayInfoDTO.setTrayId(trayId);
trayInfoDTO.setType(type);
trayInfoDTO.setWarehouseId(oldWarehouseId);
trayInfoDTO.setOrderPackageCode(orderPackageCode);
try{
warehouseUpdownTypeService.sendTrayInfoByOrderPackageCode(trayInfoDTO);
if(!Objects.isNull(oldTrayTypeId)){
warehouseUpdownTypeService.updateOldTrayTypeInfo(oldTrayTypeId,1);
}
}catch (Exception e){
if(!Objects.isNull(oldTrayTypeId)){
warehouseUpdownTypeService.updateOldTrayTypeInfoNum(oldTrayTypeId);
}
}
}
}

4
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownTypeService.java

@ -91,4 +91,8 @@ public interface IWarehouseUpdownTypeService extends BaseService<WarehouseUpdown
String findStockListAllocations(Long warehouseId, Long mallId, String sku);
void sendTrayInfoByOrderPackageCode(TrayInfoDTO trayInfoDTO);
void updateOldTrayTypeInfo(Long oldTrayTypeId, int status);
void updateOldTrayTypeInfoNum(Long oldTrayTypeId);
}

5
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java

@ -1352,8 +1352,13 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
}
}
}
save(trayTypeEntity);
//修改托盘的状态
basicdataTrayClient.updateTrayStatus(trayId,2);

10
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java

@ -312,6 +312,16 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
}
}
@Override
public void updateOldTrayTypeInfo(Long oldTrayTypeId, int status) {
baseMapper.updateOldTrayTypeInfo(oldTrayTypeId,status);
}
@Override
public void updateOldTrayTypeInfoNum(Long oldTrayTypeId) {
baseMapper.updateOldTrayTypeInfoNum(oldTrayTypeId);
}
private void packageChangeStockByAllocaton(WarehouseUpdownGoodsEntity one) {
//当前登录人选择的仓库

Loading…
Cancel
Save