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

Merge branch 'pre-production'

master
pref_mail@163.com 9 months ago
parent
e81de8f88e c7cc1e0f82
commit
fccc886a63
16 changed files with 263 additions and 33 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-biz-common/src/main/java/org/springblade/common/exception/CustomerException.java
  2. 18
      blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java
  3. 2
      blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAbnormalRecordMapper.xml
  4. 3
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataFactoryCategoryMapper.xml
  5. 1
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
  6. 4
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAddvalueServiceImpl.java
  7. 25
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionNodeWorkServiceImpl.java
  8. 79
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
  9. 5
      blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/mq/NodeDataPushListener.java
  10. 4
      blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtFactoryDataServiceImpl.java
  11. 4
      blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtOrderLogFailRetryServiceImpl.java
  12. 3
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml
  13. 73
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml
  14. 28
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java
  15. 30
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
  16. 12
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWarehousingEntryController.java

5
blade-biz-common/src/main/java/org/springblade/common/exception/CustomerException.java
Unescape View File

@ -1,5 +1,8 @@
package org.springblade.common.exception;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
*
*类说明： 自定义异常
@ -7,6 +10,8 @@ package org.springblade.common.exception;
* @author zhy
* @date 2023年6月1日
*/
@EqualsAndHashCode(callSuper = true)
@Data
public class CustomerException extends RuntimeException {
/**
*

18
blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java
Unescape View File

@ -146,6 +146,11 @@ public class LoadCarsDTO implements Serializable {
private Integer unloadAbnormal;
private Integer isSupple;
private String arriveTimeStartStr;
private String arriveTimeEndStr;
private Date arriveTimeStart;
private Date arriveTimeEnd;
private String createTimeStartStr;
private String createTimeEndStr;
@ -161,4 +166,17 @@ public class LoadCarsDTO implements Serializable {
private String carsNo;
private String carrierTimeStartStr;
private String carrierTimeEndStr;
private Date carrierTimeStart;
private Date carrierTimeEnd;
private String signTimeStartStr;
private String signTimeEndStr;
private Date signTimeStart;
private Date signTimeEnd;
}

2
blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAbnormalRecordMapper.xml
Unescape View File

@ -39,7 +39,7 @@
<if test="param.upUserName !=null and param.upUserName != ''">
and Locate(#{param.upUserName},up_user_name) > 0
</if>
<if test="param.abnormalStatus !=null and param.abnormalStatus != ''">
<if test="param.abnormalStatus !=null ">
and abnormal_status = #{param.abnormalStatus}
</if>
<if test="param.dealUserName !=null and param.dealUserName != ''">

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

@ -10,6 +10,9 @@
<if test="param.type != null ">
and type = #{param.type}
</if>
<if test="param.brand != null and param.brand != ''">
and brand = #{param.brand}
</if>
<if test="param.category != null and param.category != ''">
and category = #{param.category}
</if>

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

@ -2104,7 +2104,6 @@
lddl.id AS id,
lddl.kind AS kind,
if(lww.old_id is null,lww.id,lww.old_id) AS warehouseId,
lddl.warehouse_id AS warehouseId,
lddl.warehouse_name AS warehouseName,
lds.signing_time AS reviewTime,
CASE lddl.type

4
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAddvalueServiceImpl.java
Unescape View File

@ -288,8 +288,8 @@ public class DistributionAddvalueServiceImpl extends BaseServiceImpl<Distributio
return Resp.scanFail("添加失败", "客户信息错误");
}
// 上楼 超区 平移 搬运 分拣 专车
BigDecimal totalFee = new BigDecimal(BigInteger.ZERO);
BigDecimal currencyUnitPrice = new BigDecimal(BigInteger.ZERO);
BigDecimal totalFee = BigDecimal.ZERO;
BigDecimal currencyUnitPrice = BigDecimal.ZERO;
switch (distributionAppAddvalueDTO.getAddvalueType()) {
case "1":
if (Func.isEmpty(distributionAppAddvalueDTO.getFloolNum())) {

25
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionNodeWorkServiceImpl.java
Unescape View File

@ -125,7 +125,30 @@ public class DistributionNodeWorkServiceImpl implements IDistributionNodeWorkSer
.exchange(FanoutConstants.distribution.signfor.EXCHANGE).build();
sendFanoutMsg(build);
try {
JSONObject main = new JSONObject();
main.set("boId", taskId.toString());
NodePushMsg nodePushMsg = NodePushMsg.builder()
.operator(AuthUtil.getNickName())
.operatorTime(new Date())
.warehouse(parcelListEntity.getWarehouse())
.startWarehouse(parcelListEntity.getSendWarehouseName())
.endWarehouse(parcelListEntity.getAcceptWarehouseName())
.address("在【" + parcelListEntity.getWarehouse() + "】签收")
.brand(BrandEnums.getByValue(parcelListEntity.getBrandName()))
.node(WorkNodeEnums.SIGN_BILLOFLADING)
.main(JSONUtil.toJsonStr(main))
.content(Collections.singletonList(PushData.builder()
.packageCode(parcelListEntity.getOrderPackageCode())
.warehouseName(parcelListEntity.getWarehouse())
.waybillNumber(parcelListEntity.getWaybillNumber())
.orderCode(parcelListEntity.getOrderCode())
.build()))
.build();
factoryDataMessageSender.sendNodeDataByBrand(nodePushMsg);
}catch (Exception e){
log.error("推送工厂失败:{}",e);
}
}
@Override

79
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
Unescape View File

@ -38,14 +38,49 @@ import com.logpm.distribution.dto.DistributionStockListDTO;
import com.logpm.distribution.dto.DistrilbutionBillLadingDTO;
import com.logpm.distribution.dto.OrderStatusDTO;
import com.logpm.distribution.dto.app.BillLadingAppDTO;
import com.logpm.distribution.entity.*;
import com.logpm.distribution.entity.DisStockListDetailEntity;
import com.logpm.distribution.entity.DistributionBillLadingScanEntity;
import com.logpm.distribution.entity.DistributionDeliveryChargeEntity;
import com.logpm.distribution.entity.DistributionDeliveryDetailsEntity;
import com.logpm.distribution.entity.DistributionParcelListEntity;
import com.logpm.distribution.entity.DistributionParcelNumberEntity;
import com.logpm.distribution.entity.DistributionPrintEntity;
import com.logpm.distribution.entity.DistributionReservationZeroPackageEntity;
import com.logpm.distribution.entity.DistributionStockArticleEntity;
import com.logpm.distribution.entity.DistributionStockEntity;
import com.logpm.distribution.entity.DistributionStockListEntity;
import com.logpm.distribution.entity.DistributionStockupEntity;
import com.logpm.distribution.entity.DistributionStockupInfoEntity;
import com.logpm.distribution.entity.DistributionStockupScanEntity;
import com.logpm.distribution.entity.DistrilbutionBillLadingEntity;
import com.logpm.distribution.entity.DistrilbutionBillPackageEntity;
import com.logpm.distribution.entity.DistrilbutionBillStockEntity;
import com.logpm.distribution.excel.DistributionBillInventoryExcel;
import com.logpm.distribution.excel.DistributionBillOrderExcel;
import com.logpm.distribution.excel.DistributionBillOrderPackExcel;
import com.logpm.distribution.excel.DistrilbutionBillLadingExcel;
import com.logpm.distribution.mapper.DistributionStockListMapper;
import com.logpm.distribution.mapper.DistrilbutionBillLadingMapper;
import com.logpm.distribution.service.*;
import com.logpm.distribution.service.IDisStockListDetailService;
import com.logpm.distribution.service.IDistributionAsyncService;
import com.logpm.distribution.service.IDistributionBillLadingScanService;
import com.logpm.distribution.service.IDistributionDeliveryChargeService;
import com.logpm.distribution.service.IDistributionDeliveryDetailsService;
import com.logpm.distribution.service.IDistributionNodeWorkService;
import com.logpm.distribution.service.IDistributionParcelListService;
import com.logpm.distribution.service.IDistributionParcelNumberService;
import com.logpm.distribution.service.IDistributionPrintService;
import com.logpm.distribution.service.IDistributionReservationService;
import com.logpm.distribution.service.IDistributionReservationZeroPackageService;
import com.logpm.distribution.service.IDistributionStockArticleService;
import com.logpm.distribution.service.IDistributionStockListService;
import com.logpm.distribution.service.IDistributionStockService;
import com.logpm.distribution.service.IDistributionStockupInfoService;
import com.logpm.distribution.service.IDistributionStockupScanService;
import com.logpm.distribution.service.IDistributionStockupService;
import com.logpm.distribution.service.IDistrilbutionBillLadingService;
import com.logpm.distribution.service.IDistrilbutionBillPackageService;
import com.logpm.distribution.service.IDistrilbutionBillStockService;
import com.logpm.distribution.vo.DistributionDeliveryDetailsVO;
import com.logpm.distribution.vo.DistributionParcelNumberVO;
import com.logpm.distribution.vo.DistributionStockArticleVO;
@ -3067,6 +3102,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
distributionBillLadingScan.setScanUser(AuthUtil.getUser().getNickName());
return processScan(type, distributionBillLadingScan.getBillLadingId(), coding, distributionBillLadingScan, myCurrentWarehouse, billLadingEntity1.getPickupBatch());
// return Resp.scanSuccess("签收成功", "签收成功");
@ -3501,6 +3537,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
billLadingEntity.setExamineUserName(AuthUtil.getNickName());
billLadingEntity.setExamineUserId(AuthUtil.getUserId());
this.updateById(billLadingEntity);
DistrilbutionBillLadingEntity distrilbutionBillLadingEntity = baseMapper.selectById(billLadingEntity.getId());
//完成备货状态
distributionStockupInfoService.maintenanceStockUp(Long.parseLong(s), 2);
//查询自提单是否完成扫描
@ -3516,6 +3553,44 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
distributionAsyncService.releaseBillLadingResource(Long.parseLong(s), myCurrentWarehouse.getId());
}
parcelListIds.addAll(ladingScanEntities.stream().map(DistributionBillLadingScanEntity::getParcelListId).collect(Collectors.toSet()));
try {
List<DistributionParcelListEntity> listByOrderPackageCode = distributionParcelListService.findListByOrderPackageCode(ladingScanEntities.stream().map(DistributionBillLadingScanEntity::getPacketBarCode).collect(Collectors.toList()), myCurrentWarehouse.getId());
// 根据品牌分组
Map<String, List<DistributionParcelListEntity>> collect = listByOrderPackageCode.stream().collect(Collectors.groupingBy(DistributionParcelListEntity::getBrandName));
for (Map.Entry<String, List<DistributionParcelListEntity>> entry : collect.entrySet()) {
String brand = entry.getKey();
List<DistributionParcelListEntity> list = entry.getValue();
// 按订单分组
Map<String, List<DistributionParcelListEntity>> collect1 = list.stream().collect(Collectors.groupingBy(DistributionParcelListEntity::getOrderCode));
for (Map.Entry<String, List<DistributionParcelListEntity>> stringListEntry : collect1.entrySet()) {
String orderCode = stringListEntry.getKey();
List<DistributionParcelListEntity> list2 = stringListEntry.getValue();
JSONObject js = new JSONObject();
js.put("boId", billLadingEntity.getId());
js.put("consignee", distrilbutionBillLadingEntity.getConsignee());
js.put("images", list1.stream().map(m -> m.getSite()).collect(Collectors.toList()));
NodePushMsg msg = new NodePushMsg();
msg.setNode(WorkNodeEnums.CLERK_REVIEW);
msg.setBrand(BrandEnums.getByValue(brand));
msg.setWarehouse(myCurrentWarehouse.getName());
msg.setOperator(AuthUtil.getNickName());
msg.setOperatorTime(new Date());
msg.setContent(list2.stream().map(pushData->{
return PushData.builder()
.packageCode(pushData.getOrderPackageCode())
.warehouseName(myCurrentWarehouse.getName())
.waybillNumber(pushData.getWaybillNumber())
.orderCode(pushData.getOrderCode())
.build();
}).collect(Collectors.toList()));
msg.setMain(JSONUtil.toJsonStr(js));
log.info("推送工厂数据：{}", JSONUtil.toJsonStr(msg));
factoryDataMessageSender.sendNodeDataByBrand(msg);
}
}
}catch (Exception e){
log.error("推送失败：{}", e);
}
for (DistributionBillLadingScanEntity ladingScanEntity : ladingScanEntities) {
// 签收发送消息到工厂
pushFactoryOrderData(myCurrentWarehouse.getId(), ladingScanEntity.getParcelListId().toString(), ladingScanEntity.getOrderSelfNumbering());

5
blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/mq/NodeDataPushListener.java
Unescape View File

@ -1,7 +1,6 @@
package com.logpm.factorydata.mengtian.mq;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.EnumUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
@ -321,13 +320,13 @@ public class NodeDataPushListener {
String resBody = execute.body();
log.info("推送工厂结果：{}", resBody);
JSONObject entries = JSONUtil.parseObj(resBody);
int resultCode = entries.getInt("Result");
String resultCode = entries.getStr("Result");
// 存入日志表
entity.setContent(body);
entity.setOperationCode(operationCode);
entity.setSendUrl(mengTianProperties.getHost() + url);
entity.setResultContent(resBody);
entity.setSendStatus(Convert.toStr(resultCode));
entity.setSendStatus(StrUtil.isEmpty(resultCode) ? "0" : resultCode);
factoryNodePushService.save(entity);
}

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

@ -711,8 +711,8 @@ public class MtFactoryDataServiceImpl implements IMtFactoryDataService {
mtOrderLogEntity.setType(type);
mtOrderLogEntity.setRefCode(refCode);
Integer PUSH_STATUS_SUCCESS = 1;
Integer PUSH_STATUS_FAIL = 2;
Integer PUSH_STATUS_SUCCESS = 2;
Integer PUSH_STATUS_FAIL = 1;
JSONObject jsonObject = JSONObject.parseObject(result);
if (jsonObject == null || jsonObject.isEmpty() || 0 != jsonObject.getInteger("Result")) {

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

@ -87,8 +87,8 @@ public class MtOrderLogFailRetryServiceImpl implements MtOrderLogFailRetryServic
mtOrderLogEntity.setResBody(result);
Integer PUSH_STATUS_SUCCESS = 1;
Integer PUSH_STATUS_FAIL = 2;
Integer PUSH_STATUS_FAIL = 1;
Integer PUSH_STATUS_SUCCESS = 2;
Integer PUSH_STATUS_EXPIRE = 3;
JSONObject jsonObject = JSONObject.parseObject(result);

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

@ -51,7 +51,8 @@
sum(ltad.weight) weight,
sum(ltad.volume) volume
from logpm_trunkline_advance_detail ltad
left join logpm_basicdata_factory_category lbfc on lbfc.brand = ltad.brand and lbfc.firsts = ltad.first_pack_name and lbfc.seconds = ltad.second_pack_name and lbfc.thirds = ltad.third_pack_name
left join logpm_basicdata_factory_category lbfc on lbfc.brand = ltad.brand and type=1
and lbfc.firsts = ltad.first_pack_name and lbfc.seconds = ltad.second_pack_name and lbfc.thirds = ltad.third_pack_name and lbfc.materiel_name=ltad.material_name
left join logpm_basicdata_category lbc on lbc.id = lbfc.category_id
where ltad.is_deleted = 0
and ltad.advance_id in

73
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml
Unescape View File

@ -54,6 +54,24 @@
<if test="param.warehouseName != null and param.warehouseName != ''">
and (Locate(#{param.warehouseName},ltcl.start_warehouse_name) > 0 or Locate(#{param.warehouseName},ltcl.end_warehouse_name) > 0)
</if>
<if test="param.createTimeStart != null ">
and ltcl.create_time &gt;= #{param.createTimeStart}
</if>
<if test="param.createTimeEnd != null ">
and ltcl.create_time &lt;= #{param.createTimeEnd}
</if>
<if test="param.startTime != null ">
and ltcl.start_time &gt;= #{param.startTime}
</if>
<if test="param.endTime != null ">
and ltcl.start_time &lt;= #{param.endTime}
</if>
<if test="param.arriveTimeStart != null ">
and ltcl.arrive_time &gt;= #{param.arriveTimeStart}
</if>
<if test="param.arriveTimeEnd != null ">
and ltcl.arrive_time &lt;= #{param.arriveTimeEnd}
</if>
group by ltcl.id,ltcl.cars_no,
ltcl.plan_loading_number,
ltcl.real_loading_number,
@ -120,6 +138,24 @@
<if test="param.loadCarsNo != null and param.loadCarsNo != ''">
and Locate(#{param.loadCarsNo},ltcl.cars_no) > 0
</if>
<if test="param.createTimeStart != null ">
and ltcl.create_time &gt;= #{param.createTimeStart}
</if>
<if test="param.createTimeEnd != null ">
and ltcl.create_time &lt;= #{param.createTimeEnd}
</if>
<if test="param.startTime != null ">
and ltcl.start_time &gt;= #{param.startTime}
</if>
<if test="param.endTime != null ">
and ltcl.start_time &lt;= #{param.endTime}
</if>
<if test="param.arriveTimeStart != null ">
and ltcl.arrive_time &gt;= #{param.arriveTimeStart}
</if>
<if test="param.arriveTimeEnd != null ">
and ltcl.arrive_time &lt;= #{param.arriveTimeEnd}
</if>
group by ltcl.id,ltcl.cars_no,
ltcl.plan_loading_number,
ltcl.real_loading_number,
@ -397,12 +433,6 @@
<if test="param.type != null and param.type == 2">
and ltcl.load_status != '0'
</if>
<if test="param.startTime != null">
and ltcl.create_time &gt;= #{param.startTime}
</if>
<if test="param.endTime != null">
and ltcl.create_time &lt;= #{param.endTime}
</if>
<if test="param.loadCarsNo != null and param.loadCarsNo != ''">
and Locate(#{param.loadCarsNo},ltcl.cars_no) > 0
</if>
@ -433,6 +463,37 @@
<if test="param.settlementPerson != null and param.settlementPerson != ''">
and Locate(#{param.settlementPerson},ltcl.settlement_person) > 0
</if>
<if test="param.createTimeStart != null ">
and ltcl.create_time &gt;= #{param.createTimeStart}
</if>
<if test="param.createTimeEnd != null ">
and ltcl.create_time &lt;= #{param.createTimeEnd}
</if>
<if test="param.startTime != null ">
and ltcl.start_time &gt;= #{param.startTime}
</if>
<if test="param.endTime != null ">
and ltcl.start_time &lt;= #{param.endTime}
</if>
<if test="param.arriveTimeStart != null ">
and ltcl.arrive_time &gt;= #{param.arriveTimeStart}
</if>
<if test="param.arriveTimeEnd != null ">
and ltcl.arrive_time &lt;= #{param.arriveTimeEnd}
</if>
<if test="param.carrierTimeStart != null ">
and ltcl.arrive_time &gt;= #{param.carrierTimeStart}
</if>
<if test="param.carrierTimeEnd != null ">
and ltcl.arrive_time &lt;= #{param.carrierTimeEnd}
</if>
<if test="param.signTimeStart != null ">
and ltcl.arrive_time &gt;= #{param.signTimeStart}
</if>
<if test="param.signTimeEnd != null ">
and ltcl.arrive_time &lt;= #{param.signTimeEnd}
</if>
group by ltcl.id
order by ltcl.create_time desc
</select>

28
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java
Unescape View File

@ -4414,16 +4414,24 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
}
private Long saveNewClient(String unit, String linkman, String linkPhone, String linkAddress, String type) {
BasicdataClientEntity basicdataClientEntity = new BasicdataClientEntity();
basicdataClientEntity.setClientName(unit);
basicdataClientEntity.setTypeService(2);
basicdataClientEntity.setCargoControl(false);
basicdataClientEntity.setClientType(type);//1 工厂 2 商场 3装饰 4个人 5门店 6发货单位
basicdataClientEntity.setLinkman(linkman);
basicdataClientEntity.setPhone(linkPhone);
basicdataClientEntity.setDetailedly(linkAddress);
basicdataClientEntity.setIsNew(1);
return basicdataClientClient.addReturnId(basicdataClientEntity);
Long clientId = null;
BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findByName(unit);
if(Objects.isNull(basicdataClientEntity)){
basicdataClientEntity = new BasicdataClientEntity();
basicdataClientEntity.setClientName(unit);
basicdataClientEntity.setTypeService(2);
basicdataClientEntity.setCargoControl(false);
basicdataClientEntity.setClientType(type);//1 工厂 2 商场 3装饰 4个人 5门店 6发货单位
basicdataClientEntity.setLinkman(linkman);
basicdataClientEntity.setPhone(linkPhone);
basicdataClientEntity.setDetailedly(linkAddress);
basicdataClientEntity.setIsNew(1);
clientId = basicdataClientClient.addReturnId(basicdataClientEntity);
}else{
clientId = basicdataClientEntity.getId();
}
return clientId;
}

30
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
Unescape View File

@ -128,6 +128,16 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
page.setCurrent(loadCarsDTO.getPageNum());
page.setSize(loadCarsDTO.getPageSize());
loadCarsDTO.setCreateTimeStart(CommonUtil.getStartByDateStr(loadCarsDTO.getCreateTimeStartStr()));
loadCarsDTO.setCreateTimeEnd(CommonUtil.getEndByDateStr(loadCarsDTO.getCreateTimeEndStr()));
loadCarsDTO.setStartTime(CommonUtil.getStartByDateStr(loadCarsDTO.getStartDate()));
loadCarsDTO.setEndTime(CommonUtil.getEndByDateStr(loadCarsDTO.getEndDate()));
loadCarsDTO.setArriveTimeStart(CommonUtil.getStartByDateStr(loadCarsDTO.getArriveTimeStartStr()));
loadCarsDTO.setArriveTimeEnd(CommonUtil.getEndByDateStr(loadCarsDTO.getArriveTimeEndStr()));
IPage<TrunklineCarsLoadVO> pageList = baseMapper.loadCarsPageList(page, loadCarsDTO);
List<TrunklineCarsLoadVO> records = pageList.getRecords();
//把records中的id封装成一个set
@ -158,6 +168,15 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
page.setCurrent(loadCarsDTO.getPageNum());
page.setSize(loadCarsDTO.getPageSize());
loadCarsDTO.setCreateTimeStart(CommonUtil.getStartByDateStr(loadCarsDTO.getCreateTimeStartStr()));
loadCarsDTO.setCreateTimeEnd(CommonUtil.getEndByDateStr(loadCarsDTO.getCreateTimeEndStr()));
loadCarsDTO.setStartTime(CommonUtil.getStartByDateStr(loadCarsDTO.getStartDate()));
loadCarsDTO.setEndTime(CommonUtil.getEndByDateStr(loadCarsDTO.getEndDate()));
loadCarsDTO.setArriveTimeStart(CommonUtil.getStartByDateStr(loadCarsDTO.getArriveTimeStartStr()));
loadCarsDTO.setArriveTimeEnd(CommonUtil.getEndByDateStr(loadCarsDTO.getArriveTimeEndStr()));
IPage<TrunklineCarsLoadVO> pageList = baseMapper.arriveCarsPageList(page, loadCarsDTO);
List<TrunklineCarsLoadVO> records = pageList.getRecords();
//把records中的id封装成一个set
@ -1967,9 +1986,20 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
page.setCurrent(loadCarsDTO.getPageNum());
page.setSize(loadCarsDTO.getPageSize());
loadCarsDTO.setCreateTimeStart(CommonUtil.getStartByDateStr(loadCarsDTO.getCreateTimeStartStr()));
loadCarsDTO.setCreateTimeEnd(CommonUtil.getEndByDateStr(loadCarsDTO.getCreateTimeEndStr()));
loadCarsDTO.setStartTime(CommonUtil.getStartByDateStr(loadCarsDTO.getStartDate()));
loadCarsDTO.setEndTime(CommonUtil.getEndByDateStr(loadCarsDTO.getEndDate()));
loadCarsDTO.setArriveTimeStart(CommonUtil.getStartByDateStr(loadCarsDTO.getArriveTimeStartStr()));
loadCarsDTO.setArriveTimeEnd(CommonUtil.getEndByDateStr(loadCarsDTO.getArriveTimeEndStr()));
loadCarsDTO.setCarrierTimeStart(CommonUtil.getStartByDateStr(loadCarsDTO.getCarrierTimeStartStr()));
loadCarsDTO.setCarrierTimeEnd(CommonUtil.getEndByDateStr(loadCarsDTO.getCarrierTimeEndStr()));
loadCarsDTO.setSignTimeStart(CommonUtil.getStartByDateStr(loadCarsDTO.getSignTimeStartStr()));
loadCarsDTO.setSignTimeEnd(CommonUtil.getEndByDateStr(loadCarsDTO.getSignTimeEndStr()));
IPage<TripartiteTransferVO> pageList = baseMapper.tripartiteTransferPageList(page, loadCarsDTO);
return pageList;

12
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWarehousingEntryController.java
Unescape View File

@ -34,6 +34,8 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springblade.common.exception.CustomerException;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
@ -62,6 +64,7 @@ import java.util.stream.Collectors;
* @since 2023-07-10
*/
@RestController
@Slf4j
@AllArgsConstructor
@RequestMapping("/warehouseWarehousingEntry")
@Api(value = "仓库入库单", tags = "仓库入库单接口")
@ -181,8 +184,13 @@ public class WarehouseWarehousingEntryController extends BladeController {
@ApiOperation(value = "导入入库数据", notes = "传入excel")
public R importWarehousingEntry(MultipartFile file, Integer isCovered) {
isCovered = 1;
WarehouseEntryImporter userImporter = new WarehouseEntryImporter(warehouseWarehousingEntryService, isCovered == 1);
ExcelUtil.save(file, userImporter, WarehousingEntryDetailExcel.class);
try {
WarehouseEntryImporter userImporter = new WarehouseEntryImporter(warehouseWarehousingEntryService, isCovered == 1);
ExcelUtil.save(file, userImporter, WarehousingEntryDetailExcel.class);
}catch (CustomerException e){
log.error("导入失败",e);
return R.fail(e.getMessage());
}
return R.success("操作成功");
}

Write Preview
Loading…
Cancel
Save