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

Merge branch 'pre-production'

newStockUp
zhenghaoyu 1 year ago
parent
b5a4be154c 5fff2ee5f6
commit
48218e4c8b
6 changed files with 29 additions and 12 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. 3
      blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseUpdownTypeClient.java
  2. 3
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml
  3. 20
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
  4. 5
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
  5. 5
      blade-service/logpm-factory/src/test/java/com/logpm/factory/TestService.java
  6. 5
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseUpdownTypeClient.java

3
blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseUpdownTypeClient.java
Unescape View File

@ -56,6 +56,7 @@ public interface IWarehouseUpdownTypeClient {
@GetMapping(TOP + "/downPackageOrDelTray")
R downPackageOrDelTray(@RequestParam("orderPackageCodes") String orderPackageCodes, @RequestParam("warehouseId") Long warehouseId);
@GetMapping(TOP + "/downTray")
R downTray(@RequestParam("trayCode") String trayCode, @RequestParam("warehouseId") Long warehouseId);
}

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

@ -84,6 +84,9 @@
<if test="po.palletCode !=null and po.palletCode != ''">
and tray.pallet_code like concat('%',#{po.palletCode},'%')
</if>
<if test="po.palletName !=null and po.palletName != ''">
and tray.pallet_name like concat('%',#{po.palletName},'%')
</if>
</where>
order by tray.create_time desc
</select>

20
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
Unescape View File

@ -23,7 +23,6 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.google.gson.JsonObject;
import com.logpm.basic.entity.BasicPrintTemplateEntity;
import com.logpm.basic.feign.IBasicPrintTemplateClient;
import com.logpm.basicdata.entity.BasicdataDriverArteryEntity;
@ -5626,13 +5625,23 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
List<Map<String, Object>> spaclOrderList = buildSpaclOrders(distributionReservationEntity, 1);
map.put("定制品集合", spaclOrderList);
map.put("定制品合计", spaclOrderList.stream().mapToInt(map1 -> Integer.parseInt(map1.get("数量").toString())).sum());
Integer spaclNum = 0;
for (Map<String, Object> m:spaclOrderList){
Integer num = (Integer) m.get("数量");
spaclNum = spaclNum + num;
}
map.put("定制品合计", spaclNum);
// 通过预约单查询预约下面的订单 --1 或者 库存品 --2
List<Map<String, Object>> spaclStockList = buildSpaclOrders(distributionReservationEntity, 2);
if (spaclStockList.size() > 0 && !spaclStockList.isEmpty()) {
map.put("库存品集合", spaclStockList);
map.put("库存品合计", spaclStockList.stream().mapToInt(map1 -> Integer.parseInt(map1.get("数量").toString())).sum());
Integer spaclStockNum = 0;
for (Map<String, Object> m:spaclStockList){
Integer num = (Integer) m.get("数量");
spaclStockNum = spaclStockNum + num;
}
map.put("库存品合计", spaclStockNum);
}
@ -5789,11 +5798,12 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
if (ObjectUtils.isNull(distributionStockListEntity)) {
continue;
}
Integer reservationNum = reservationStocklistEntity.getReservationNum();
temp.put("合同号", distributionStockListEntity.getOrderCode());
temp.put("产品名称", distributionStockListEntity.getDescriptionGoods());
temp.put("产品名称", distributionStockListEntity.getDescriptionGoods()+"("+reservationNum+")");
//todo 单位是否需要查询物料表
temp.put("单位", Optional.ofNullable(distributionStockListEntity.getCargoUnit()).orElse(null));
temp.put("数量", reservationStocklistEntity.getReservationNum());
temp.put("数量", reservationNum);
temp.put("备货区", getStockupArea(distributionReservationEntity.getId()));
//todo 这里还没完成
List<String> allocationList = distributionReservationMapper.getStockListAllocation(distributionStockListEntity.getId(), distributionReservationEntity.getId());

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

@ -1808,7 +1808,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
list1.add(distributionStock);
}
});
String collect = voList.stream().map(DistributionStockPackageVO::getPacketBarCode).collect(Collectors.joining(","));
Long warehouseId ;
if(one.getStockUpType().equals("3")){
DistrilbutionBillLadingEntity distrilbutionBillLadingEntity = distrilbutionBillLadingMapper.selectById(stockupDTO.getReservationId());
@ -1820,8 +1820,9 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
if(ObjectUtils.isNull(warehouseId)){
throw new ServiceException("预约信息不存在，无法备货！");
}
String trayCode= stockupDTO.getTrayBarCode() ;
//货位下架
R r = warehouseUpdownTypeClient.downPackage(collect,warehouseId );
R r = warehouseUpdownTypeClient.downTray(trayCode,warehouseId );
if(r.getCode() != 200){
throw new ServiceException("下架失败！！");
}

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

@ -11,7 +11,6 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.nacos.common.utils.MD5Utils;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.logpm.factory.excel.ExcelMode14;
import com.logpm.factory.excel.JpDataMode;
import com.logpm.factory.listener.ExcelListener;
@ -28,7 +27,6 @@ import com.logpm.factory.zb.mapper.ZbCategoryContrastMapper;
import com.logpm.factory.zb.service.IZbFactoryDataService;
import com.logpm.factory.zb.service.IZbFactoryLogService;
import com.logpm.factory.zb.untils.QmSignUntil;
import com.logpm.oldproject.entity.AdvanceEntity;
import org.apache.commons.fileupload.FileItem;
import org.apache.commons.fileupload.disk.DiskFileItemFactory;
import org.apache.commons.io.IOUtils;
@ -393,7 +391,8 @@ public class TestService {
ahsv.add("{\"送货任务ID\":\"210315\",\"收货人\":\"李荣忠\",\"签收内容\":[{\"订单编号\":\"scmhzs01DS-20675-0\",\"包条码\":\"SCMHZS01DS206750001\",\"签收时间\":\"2023-10-26 16:21:05\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230975\"},{\"订单编号\":\"scmhzs01DS-20675-0\",\"包条码\":\"SCMHZS01DS206750002\",\"签收时间\":\"2023-10-26 16:21:05\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230975\"},{\"订单编号\":\"scmhzs01DS-20675-0\",\"包条码\":\"SCMHZS01DS206750003\",\"签收时间\":\"2023-10-26 16:21:05\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230975\"},{\"订单编号\":\"scmhzs01DS-20675-0\",\"包条码\":\"SCMHZS01DS206750004\",\"签收时间\":\"2023-10-26 16:21:05\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230975\"},{\"订单编号\":\"scmhzs01DS-20675-0\",\"包条码\":\"SCMHZS01DS206750005\",\"签收时间\":\"2023-10-26 16:21:05\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230975\"},{\"订单编号\":\"scmhzs01DS-20675-0\",\"包条码\":\"SCMHZS01DS206750006\",\"签收时间\":\"2023-10-26 16:21:05\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230975\"},{\"订单编号\":\"scmhzs01DS-20675-0\",\"包条码\":\"SCMHZS01DS206750007\",\"签收时间\":\"2023-10-26 16:21:05\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230975\"},{\"订单编号\":\"scmhzs01DS-20675-0\",\"包条码\":\"SCMHZS01DS206750008\",\"签收时间\":\"2023-10-26 16:21:05\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230975\"},{\"订单编号\":\"scmhzs01DS-20675-0\",\"包条码\":\"SCMHZS01DS206750009\",\"签收时间\":\"2023-10-26 16:21:05\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230975\"},{\"订单编号\":\"scmhzs01DS-20675-0\",\"包条码\":\"SCMHZS01DS206750010\",\"签收时间\":\"2023-10-26 16:21:05\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230975\"}],\"签收图片\":[{\"image\":\"http://htys.oss-cn-chengdu.aliyuncs.com/htys/5675a6a2c99a47442995b45c7f700330.jpg\"},{\"image\":\"http://htys.oss-cn-chengdu.aliyuncs.com/htys/6e97901316c8854cb45260cae85d36e5.jpg\"},{\"image\":\"http://htys.oss-cn-chengdu.aliyuncs.com/htys/d3090f8e044bbc442331c4f04fe54c32.jpg\"},{\"image\":\"http://htys.oss-cn-chengdu.aliyuncs.com/htys/02fe82d8431d17969fac8e0747855a09.jpg\"}]}");
//ahsv.add("{\"送货任务ID\":\"210315\",\"收货人\":\"李荣忠\",\"签收内容\":[{\"订单编号\":\"scmhzs01DS-20675-0\",\"包条码\":\"SCMHZS01DS206750001\",\"签收时间\":\"2023-10-26 16:21:05\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230975\"},{\"订单编号\":\"scmhzs01DS-20675-0\",\"包条码\":\"SCMHZS01DS206750002\",\"签收时间\":\"2023-10-26 16:21:05\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230975\"},{\"订单编号\":\"scmhzs01DS-20675-0\",\"包条码\":\"SCMHZS01DS206750003\",\"签收时间\":\"2023-10-26 16:21:05\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230975\"},{\"订单编号\":\"scmhzs01DS-20675-0\",\"包条码\":\"SCMHZS01DS206750004\",\"签收时间\":\"2023-10-26 16:21:05\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230975\"},{\"订单编号\":\"scmhzs01DS-20675-0\",\"包条码\":\"SCMHZS01DS206750005\",\"签收时间\":\"2023-10-26 16:21:05\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230975\"},{\"订单编号\":\"scmhzs01DS-20675-0\",\"包条码\":\"SCMHZS01DS206750006\",\"签收时间\":\"2023-10-26 16:21:05\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230975\"},{\"订单编号\":\"scmhzs01DS-20675-0\",\"包条码\":\"SCMHZS01DS206750007\",\"签收时间\":\"2023-10-26 16:21:05\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230975\"},{\"订单编号\":\"scmhzs01DS-20675-0\",\"包条码\":\"SCMHZS01DS206750008\",\"签收时间\":\"2023-10-26 16:21:05\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230975\"},{\"订单编号\":\"scmhzs01DS-20675-0\",\"包条码\":\"SCMHZS01DS206750009\",\"签收时间\":\"2023-10-26 16:21:05\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230975\"},{\"订单编号\":\"scmhzs01DS-20675-0\",\"包条码\":\"SCMHZS01DS206750010\",\"签收时间\":\"2023-10-26 16:21:05\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230975\"}],\"签收图片\":[{\"image\":\"http://htys.oss-cn-chengdu.aliyuncs.com/htys/5675a6a2c99a47442995b45c7f700330.jpg\"},{\"image\":\"http://htys.oss-cn-chengdu.aliyuncs.com/htys/6e97901316c8854cb45260cae85d36e5.jpg\"},{\"image\":\"http://htys.oss-cn-chengdu.aliyuncs.com/htys/d3090f8e044bbc442331c4f04fe54c32.jpg\"},{\"image\":\"http://htys.oss-cn-chengdu.aliyuncs.com/htys/02fe82d8431d17969fac8e0747855a09.jpg\"}]}");
ahsv.add("{\"送货任务ID\":\"215330\",\"收货人\":\"曹海静（美画）\",\"签收内容\":[{\"订单编号\":\"scmhzs01DS-20793-0\",\"包条码\":\"SCMHZS01DS207930001\",\"签收时间\":\"2023-11-05 15:52:48\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231074\"},{\"订单编号\":\"scmhzs01DS-20793-0\",\"包条码\":\"SCMHZS01DS207930002\",\"签收时间\":\"2023-11-05 15:52:48\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231074\"},{\"订单编号\":\"scmhzs01DS-20793-0\",\"包条码\":\"SCMHZS01DS207930003\",\"签收时间\":\"2023-11-05 15:52:48\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231074\"},{\"订单编号\":\"scmhzs01DS-20793-0\",\"包条码\":\"SCMHZS01DS207930004\",\"签收时间\":\"2023-11-05 15:52:48\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231074\"},{\"订单编号\":\"scmhzs01DS-20793-0\",\"包条码\":\"SCMHZS01DS207930005\",\"签收时间\":\"2023-11-05 15:52:48\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231074\"}],\"签收图片\":[{\"image\":\"http://htys.oss-cn-chengdu.aliyuncs.com/htys/a7ead4403bc3f2407abd67da0ee78c09.jpg\"},{\"image\":\"http://htys.oss-cn-chengdu.aliyuncs.com/htys/6766998be765d6f1c8ba8e046ca46979.jpg\"},{\"image\":\"http://htys.oss-cn-chengdu.aliyuncs.com/htys/aeac81821a28de4391544f248e78cd21.jpg\"}]}");
// ahsv.add("{\"送货任务ID\":\"210344\",\"收货人\":\"王思\",\"签收内容\":[{\"订单编号\":\"scltjj01DS-20320-0\",\"包条码\":\"SCLTJJ01DS203200001\",\"签收时间\":\"2023-10-26 15:59:30\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230866\"},{\"订单编号\":\"scltjj01DS-20320-0\",\"包条码\":\"SCLTJJ01DS203200002\",\"签收时间\":\"2023-10-26 15:59:30\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230866\"},{\"订单编号\":\"scltjj01DS-20320-0\",\"包条码\":\"SCLTJJ01DS203200003\",\"签收时间\":\"2023-10-26 15:59:30\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230866\"},{\"订单编号\":\"scltjj01DS-20320-0\",\"包条码\":\"SCLTJJ01DS203200004\",\"签收时间\":\"2023-10-26 15:59:30\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230866\"},{\"订单编号\":\"scltjj01DS-20320-0\",\"包条码\":\"SCLTJJ01DS203200005\",\"签收时间\":\"2023-10-26 15:59:30\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230866\"},{\"订单编号\":\"scltjj01DS-20320-0\",\"包条码\":\"SCLTJJ01DS203200006\",\"签收时间\":\"2023-10-26 15:59:30\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230866\"},{\"订单编号\":\"scltjj01DS-20320-0\",\"包条码\":\"SCLTJJ01DS203200007\",\"签收时间\":\"2023-10-26 15:59:30\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230866\"},{\"订单编号\":\"scltjj01DS-20320-0\",\"包条码\":\"SCLTJJ01DS203200008\",\"签收时间\":\"2023-10-26 15:59:30\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230866\"},{\"订单编号\":\"scltjj01DS-20320-0\",\"包条码\":\"SCLTJJ01DS203200009\",\"签收时间\":\"2023-10-26 15:59:30\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230866\"},{\"订单编号\":\"scltjj01DS-20320-0\",\"包条码\":\"SCLTJJ01DS203200010\",\"签收时间\":\"2023-10-26 15:59:30\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-230866\"}],\"签收图片\":[{\"image\":\"http://htys.oss-cn-chengdu.aliyuncs.com/htys/8b831a30d1eae33ed8b29ff95a86f4a9.jpg\"},{\"image\":\"http://htys.oss-cn-chengdu.aliyuncs.com/htys/1016c8a5453ee8b3e48410a8ac43dc34.jpg\"},{\"image\":\"http://htys.oss-cn-chengdu.aliyuncs.com/htys/f0f0c9a5ed932847a83a677069abe75b.jpg\"}]}");
// ahsv.add("{\"送货任务ID\":\"210336\",\"收货人\":\"家装事业部\",\"签收内容\":[{\"订单编号\":\"HY0015-20320-0\",\"包条码\":\"HY0015203200001\",\"签收时间\":\"2023-10-26 16:15:05\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231039\"},{\"订单编号\":\"HY0015-20320-0\",\"包条码\":\"HY0015203200002\",\"签收时间\":\"2023-10-26 16:15:05\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231039\"},{\"订单编号\":\"HY0015-20321-0\",\"包条码\":\"HY0015203210001\",\"签收时间\":\"2023-10-26 16:15:05\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231039\"},{\"订单编号\":\"HY0015-20321-0\",\"包条码\":\"HY0015203210002\",\"签收时间\":\"2023-10-26 16:15:05\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231039\"}],\"签收图片\":[{\"image\":\"http://htys.oss-cn-chengdu.aliyuncs.com/htys/ac9f6f168243da22067747ebcc98bd94.jpg\"},{\"image\":\"http://htys.oss-cn-chengdu.aliyuncs.com/htys/8c26d72abd7b89a9c9ab65884582e67a.jpg\"},{\"image\":\"http://htys.oss-cn-chengdu.aliyuncs.com/htys/477ab33a0518d0fd3e6887656da2c342.jpg\"}]}");
// ahsv.add("{\"送货任务ID\":\"210320\",\"收货人\":\"陈蕾\",\"签收内容\":[{\"订单编号\":\"scltjj01DS-20466-0\",\"包条码\":\"SCLTJJ01DS204660001\",\"签收时间\":\"2023-10-26 16:17:22\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231048\"},{\"订单编号\":\"scltjj01DS-20466-0\",\"包条码\":\"SCLTJJ01DS204660002\",\"签收时间\":\"2023-10-26 16:17:22\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231048\"},{\"订单编号\":\"scltjj01DS-20466-0\",\"包条码\":\"SCLTJJ01DS204660003\",\"签收时间\":\"2023-10-26 16:17:22\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231048\"},{\"订单编号\":\"scltjj01DS-20466-0\",\"包条码\":\"SCLTJJ01DS204660004\",\"签收时间\":\"2023-10-26 16:17:22\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231048\"},{\"订单编号\":\"scltjj01DS-20466-0\",\"包条码\":\"SCLTJJ01DS204660005\",\"签收时间\":\"2023-10-26 16:17:22\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231048\"},{\"订单编号\":\"scltjj01DS-20466-0\",\"包条码\":\"SCLTJJ01DS204660006\",\"签收时间\":\"2023-10-26 16:17:22\",\"仓库编号\":\"CDZXC3\",\"作业仓库\":\"成都中心仓(汇通)\",\"发货单编号\":\"HYLEJIA-231048\"}],\"签收图片\":[{\"image\":\"http://htys.oss-cn-chengdu.aliyuncs.com/htys/10f6b1ad8dab16a07222d56ac828d1b0.jpg\"},{\"image\":\"http://htys.oss-cn-chengdu.aliyuncs.com/htys/b1c62e225f1cd19d7056c39f84393a77.jpg\"},{\"image\":\"http://htys.oss-cn-chengdu.aliyuncs.com/htys/008f4892b39972a934b95167ebf74305.jpg\"}]}");

5
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseUpdownTypeClient.java
Unescape View File

@ -20,7 +20,6 @@ import com.alibaba.fastjson.JSONObject;
import com.logpm.warehouse.dto.UpShelfPackageDTO;
import com.logpm.warehouse.dto.UpShelfStockDTO;
import com.logpm.warehouse.dto.UpShelfZeroOrderDTO;
import com.logpm.warehouse.service.IWarehouseTaryAllocationService;
import com.logpm.warehouse.service.IWarehouseUpdownTypeService;
import lombok.AllArgsConstructor;
import org.springblade.core.tool.api.R;
@ -76,6 +75,10 @@ public class WarehouseUpdownTypeClient implements IWarehouseUpdownTypeClient {
}
}
@Override
public R downTray(String trayCode, Long warehouseId) {
return warehouseUpdownTypeService.downTrayCode(trayCode,warehouseId);
}
@Override

Write Preview
Loading…
Cancel
Save