Browse Source

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

master
zhenghaoyu 6 months ago
parent
commit
fd480953c0
  1. 78
      blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/BillladingWaybillExportVO.java
  2. 17
      blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/LoadingDetailExportVO.java
  3. 78
      blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineBillladingExportVO.java
  4. 34
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/BillladingController.java
  5. 35
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java
  6. 3
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingMapper.java
  7. 66
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingMapper.xml
  8. 3
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingWaybillMapper.java
  9. 40
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingWaybillMapper.xml
  10. 1
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.java
  11. 53
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml
  12. 12
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml
  13. 3
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceDetailService.java
  14. 6
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineBillladingService.java
  15. 3
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineBillladingWaybillService.java
  16. 2
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadService.java
  17. 15
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java
  18. 8
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java
  19. 13
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingServiceImpl.java
  20. 6
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingWaybillServiceImpl.java
  21. 14
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
  22. 24
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineWaybillPackageServiceImpl.java

78
blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/BillladingWaybillExportVO.java

@ -0,0 +1,78 @@
package com.logpm.trunkline.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
@Data
public class BillladingWaybillExportVO implements Serializable {
@ExcelProperty(value = "提货批次")
private String billadingCode;
@ExcelProperty(value = "运单号")
private String waybillNo;
@ExcelProperty(value = "开单时间")
@JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date openOrderTime;
@ExcelProperty(value = "货物名称")
private String goodsName;
@ExcelProperty(value = "扫描件数")
private Integer scanNum;
@ExcelProperty(value = "提货件数")
private Integer realNum;
@ExcelProperty(value = "提货重量")
private BigDecimal realWeight;
@ExcelProperty(value = "提货体积")
private BigDecimal realVolume;
@ExcelProperty(value = "到站")
private String destination;
@ExcelProperty(value = "目的仓")
private String destinationWarehouseName;
@ExcelProperty(value = "发货人")
private String shipperName;
@ExcelProperty(value = "发货单位")
private String shipper;
@ExcelProperty(value = "发货手机")
private String shipperMobile;
@ExcelProperty(value = "收货人")
private String consigneeName;
@ExcelProperty(value = "收货单位")
private String consignee;
@ExcelProperty(value = "收货电话")
private String consigneeMobile;
@ExcelProperty(value = "收货地址")
private String consigneeAddress;
@ExcelProperty(value = "备注")
private String remark;
@ExcelProperty(value = "支付方式")
private BigDecimal collectPay;
@ExcelProperty(value = "提货费用")
private BigDecimal billladingFee;
@ExcelProperty(value = "运输费用")
private BigDecimal totalFreight;
}

17
blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/LoadingDetailExportVO.java

@ -34,6 +34,9 @@ public class LoadingDetailExportVO implements Serializable {
@ExcelProperty(value = "装卸状态")
private String scanStatus;
@ExcelProperty(value = "运单目的仓")
private String destinationWarehouseName;
@ExcelProperty(value = "托盘名称")
private String trayName;
@ -46,12 +49,19 @@ public class LoadingDetailExportVO implements Serializable {
@ExcelProperty(value = "卸车人")
private String unloadUserName;
@ExcelProperty(value = "卸车时间")
@JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date unloadTime;
@ExcelProperty(value = "类型")
private String type;
@ExcelProperty(value = "数量")
private String num;
@ExcelProperty(value = "卸车数")
private String unloadNum;
@ExcelProperty(value = "有无数据")
private String isData;
@ -68,8 +78,11 @@ public class LoadingDetailExportVO implements Serializable {
@JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date loadingTime;
@ExcelProperty(value = "卸车时间")
@ExcelProperty(value = "签收人")
private String signUserName;
@ExcelProperty(value = "签收时间")
@JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date unloadTime;
private Date signTime;
}

78
blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineBillladingExportVO.java

@ -0,0 +1,78 @@
package com.logpm.trunkline.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
@Data
public class TrunklineBillladingExportVO implements Serializable {
@ExcelProperty(value = "提货批次")
private String billladingCode ;
@ExcelProperty(value = "车牌号")
private String carNumber ;
@ExcelProperty(value = "司机名称")
private String driverName ;
@ExcelProperty(value = "司机电话")
private String driverPhone ;
@ExcelProperty(value = "仓库名称")
private String warehouseName ;
@ExcelProperty(value = "线路名称")
private String lineNameTitle ;
@ExcelProperty(value = "提货开始时间")
@JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date startTime ;
@ExcelProperty(value = "提货完成时间")
@JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date endTime ;
@ExcelProperty(value = "状态")
private String billladingStatus ;
@ExcelProperty(value = "计费模式")
private String chargeType ;
@ExcelProperty(value = "提货费用")
private BigDecimal totalFee ;
@ExcelProperty(value = "备注")
private String remark ;
@ExcelProperty(value = "承运商")
private String carrierName ;
@ExcelProperty(value = "单数")
private Integer orderNum;
@ExcelProperty(value = "件数")
private Integer realNum;
@ExcelProperty(value = "预计件数")
private Integer planNum ;
@ExcelProperty(value = "重量")
private BigDecimal realWeight ;
@ExcelProperty(value = "计划重量")
private BigDecimal planWeight ;
@ExcelProperty(value = "体积")
private BigDecimal realVolume ;
@ExcelProperty(value = "计划体积")
private BigDecimal planVolume ;
@ExcelProperty(value = "创建人")
private String createUserName ;
}

34
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/BillladingController.java

@ -7,6 +7,8 @@ import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
import com.logpm.trunkline.dto.BillladingDTO;
import com.logpm.trunkline.dto.BillladingWaybillDTO;
import com.logpm.trunkline.service.ITrunklineBillladingService;
import com.logpm.trunkline.vo.BillladingWaybillExportVO;
import com.logpm.trunkline.vo.TrunklineBillladingExportVO;
import com.logpm.trunkline.vo.TrunklineBillladingVO;
import com.logpm.warehouse.feign.IWarehouseWaybillClient;
import io.swagger.annotations.Api;
@ -15,12 +17,14 @@ import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springblade.common.constant.DictBizConstant;
import org.springblade.common.exception.CustomerException;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.StringUtil;
import org.springblade.system.cache.DictBizCache;
import org.springblade.system.entity.DictBiz;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.util.List;
import java.util.Objects;
@ -67,6 +71,20 @@ public class BillladingController {
}
}
@ResponseBody
@PostMapping("/pageListExport")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "提货单列表导出", notes = "传入waybillDTO")
public void pageListExport(@RequestBody BillladingDTO billladingDTO, HttpServletResponse response) {
String method = "############pageListExport: ";
log.info(method+"请求参数{}",billladingDTO);
List<TrunklineBillladingExportVO> ls = trunklineBillladingService.pageListExport(billladingDTO);
//导出ls
ExcelUtil.export(response, "提货数据列表", "提货数据", ls, TrunklineBillladingExportVO.class);
}
@ResponseBody
@PostMapping("/findChargeTypeList")
@ApiOperationSupport(order = 1)
@ -312,6 +330,22 @@ public class BillladingController {
}
}
@ResponseBody
@PostMapping("/billladingDetailExport")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "提货单详情导出", notes = "传入waybillDTO")
public void billladingDetailExport(@RequestBody BillladingDTO billladingDTO,HttpServletResponse response) {
String method = "############billladingDetailExport: ";
log.info(method+"请求参数{}",billladingDTO);
List<BillladingWaybillExportVO> list = trunklineBillladingService.billladingDetailExport(billladingDTO.getBillladingId());
//导出ls
ExcelUtil.export(response, "提货单运单数据", "提货运单数据", list, BillladingWaybillExportVO.class);
}
@ResponseBody
@PostMapping("/billladingPackageDetail")
@ApiOperationSupport(order = 1)

35
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java

@ -1303,6 +1303,41 @@ public class CarsLoadController {
}
}
@ResponseBody
@PostMapping("/signOrderZeroSuppleList")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "签收单零担补录列表", notes = "传入loadCarsDTO")
public R signOrderZeroSuppleList(@RequestBody LoadCarsDTO loadCarsDTO) {
String method = "############signOrderZeroSuppleList: ";
log.info(method+"请求参数{}",loadCarsDTO);
try{
Long signOrderId = loadCarsDTO.getSignOrderId();
if(Objects.isNull(signOrderId)){
log.warn(method+"签收单id不能为空 signOrderId={}",signOrderId);
return R.fail(400,"签收单id不能为空");
}
//当前登录人选择的仓库
BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
if(Objects.isNull(myCurrentWarehouse)){
log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse);
return R.fail(400,"多仓权限无法操作,请选择仓库");
}
loadCarsDTO.setWarehouseId(myCurrentWarehouse.getId());
return carsLoadService.signOrderZeroSuppleList(loadCarsDTO);
}catch (CustomerException e){
log.error(e.message,e);
return R.fail(e.code,e.message);
}catch (Exception e){
log.error(method+"系统异常",e);
return R.fail(500,"系统异常");
}
}
@ResponseBody
@PostMapping("/useZeroList")
@ApiOperationSupport(order = 1)

3
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingMapper.java

@ -7,6 +7,7 @@ import com.logpm.trunkline.entity.TrunklineBillladingEntity;
import com.logpm.trunkline.entity.TrunklineBillladingLogEntity;
import com.logpm.trunkline.vo.TrunklineBillladingDetailListVO;
import com.logpm.trunkline.vo.TrunklineBillladingDetailVO;
import com.logpm.trunkline.vo.TrunklineBillladingExportVO;
import com.logpm.trunkline.vo.TrunklineBillladingVO;
import com.logpm.warehouse.vo.WarehouseWaybillVO;
import org.apache.ibatis.annotations.Mapper;
@ -32,4 +33,6 @@ public interface TrunklineBillladingMapper extends BaseMapper<TrunklineBillladin
Map<String, Integer> billladingNum(@Param("warehouseId") Long warehouseId, @Param("startByDateStr") Date startByDateStr, @Param("endByDateStr") Date endByDateStr, @Param("customerTrain") String customerTrain);
List<TrunklineBillladingLogEntity> findBillladingLogList(@Param("billladingId") Long billladingId);
List<TrunklineBillladingExportVO> pageListExport(@Param("param") BillladingDTO billladingDTO);
}

66
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingMapper.xml

@ -65,6 +65,72 @@
order by ltb.create_time desc
</select>
<select id="pageListExport" resultType="com.logpm.trunkline.vo.TrunklineBillladingExportVO">
select ltb.billlading_code billladingCode,
ltb.car_number carNumber,
ltb.driver_name driverName,
ltb.driver_phone driverPhone,
ltb.warehouse_name warehouseName,
ltb.line_name_title lineNameTitle,
ltb.start_time startTime,
ltb.end_time endTime,
case when ltb.billlading_status = '1' then '未开始'
when ltb.billlading_status = '2' then '提货中'
when ltb.billlading_status = '3' then '已完成'
when ltb.billlading_status = '4' then '已结算'
when ltb.billlading_status = '5' then '已取消'
end billladingStatus,
case when ltb.charge_type = '1' then '按件计费'
when ltb.charge_type = '2' then '按重量计费'
when ltb.charge_type = '3' then '按体积计费'
end chargeType,
ltb.total_fee totalFee,
ltb.remark remark,
ltb.carrier_name carrierName,
ltb.real_num realNum,
ltb.plan_num planNum,
ltb.real_weight realWeight,
ltb.plan_weight planWeight,
ltb.real_volume realVolume,
ltb.plan_volume planVolume,
ltb.create_user_name createUserName,
count(DISTINCT ltbw.id) orderNum
from logpm_trunkline_billlading ltb
left join logpm_trunkline_billlading_line ltbl on ltbl.billlading_id = ltb.id and ltbl.is_deleted = 0
left join logpm_trunkline_billlading_waybill ltbw on ltbw.billlading_id = ltb.id and ltbw.waybill_no != '————'
where ltb.is_deleted = 0
and ltb.billlading_status != 5
<if test="param.warehouseId != null ">
and ltb.warehouse_id = #{param.warehouseId}
</if>
<if test="param.billladingCode != null and param.billladingCode != '' ">
and ltb.billlading_code = #{param.billladingCode}
</if>
<if test="param.carNumber != null and param.carNumber != '' ">
and ltb.car_number = #{param.carNumber}
</if>
<if test="param.driverName != null and param.driverName != '' ">
and ltb.driver_name = #{param.driverName}
</if>
<if test="param.driverPhone != null and param.driverPhone != '' ">
and ltb.driver_phone = #{param.driverPhone}
</if>
<if test="param.warehouseName != null and param.warehouseName != '' ">
and ltb.warehouse_name = #{param.warehouseName}
</if>
<if test="param.billladingStatus != null and param.billladingStatus != '' ">
and ltb.billlading_status = #{param.billladingStatus}
</if>
<if test="param.chargeType != null and param.chargeType != '' ">
and ltb.charge_type = #{param.chargeType}
</if>
<if test="param.createUserName != null and param.createUserName != '' ">
and ltb.create_user_name = #{param.createUserName}
</if>
group by ltb.id
order by ltb.create_time desc
</select>
<select id="pageInfoList" resultType="com.logpm.trunkline.vo.TrunklineBillladingVO">
select id id,

3
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingWaybillMapper.java

@ -3,6 +3,7 @@ package com.logpm.trunkline.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.logpm.trunkline.entity.TrunklineBillladingWaybillEntity;
import com.logpm.trunkline.entity.TrunklineWaybillOrderEntity;
import com.logpm.trunkline.vo.BillladingWaybillExportVO;
import com.logpm.trunkline.vo.TrunklineBillladingNumVO;
import com.logpm.trunkline.vo.TrunklineBillladingWaybillVO;
import org.apache.ibatis.annotations.Mapper;
@ -31,4 +32,6 @@ public interface TrunklineBillladingWaybillMapper extends BaseMapper<TrunklineBi
List<TrunklineBillladingWaybillEntity> findNoFinishWaybillByBillladingId(@Param("billladingId") Long billladingId);
TrunklineBillladingNumVO getNumVOByBillladingId(@Param("billladingId") Long billladingId);
List<BillladingWaybillExportVO> findWaybillInfoListByBillladingIdExport(@Param("billladingId") Long billladingId);
}

40
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingWaybillMapper.xml

@ -111,4 +111,44 @@
and is_deleted = 0
</select>
<select id="findWaybillInfoListByBillladingIdExport" resultType="com.logpm.trunkline.vo.BillladingWaybillExportVO">
select ltb.billlading_code billadingCode,
ltbw.waybill_no waybillNo,
lww.create_time openOrderTime,
lww.goods_name goodsName,
ltbw.real_num realNum,
ltbw.real_weight realWeight,
ltbw.real_volume realVolume,
lww.destination destination,
lww.destination_warehouse_name destinationWarehouseName,
lww.shipper shipper,
lww.shipper_name shipperName,
lww.shipper_mobile shipperMobile,
lww.consignee consignee,
lww.consignee_name consigneeName,
lww.consignee_mobile consigneeMobile,
lww.consignee_address consigneeAddress,
lww.remark remark,
lww.total_count-lww.billlading_num totalPlanNum,
lww.total_count-lww.billlading_num + ltbw.real_num planNum,
ltbw.real_num realNum,
ltbw.billlading_fee billladingFee,
lww.collect_pay collectPay,
lww.total_freight totalFreight,
t.num scanNum
from logpm_trunkline_billlading_waybill ltbw
left join (select IFNULL(ltad.waybill_no,'————') waybillNo,
COUNT(ltbp.id) num
from logpm_trunkline_billlading_package ltbp
left join logpm_platform.logpm_trunkline_advance_detail ltad on ltbp.order_package_code = ltad.order_package_code
where ltbp.billlading_id=#{billladingId}
group by IFNULL(ltad.waybill_no,'————')) t on t.waybillNo = ltbw.waybill_no
left join logpm_trunkline_billlading ltb on ltb.id = ltbw.billlading_id
left join logpm_warehouse_waybill lww on lww.waybill_no = ltbw.waybill_no
where ltbw.billlading_id = #{billladingId}
and ltbw.is_deleted = 0
and ltbw.real_num > 0
</select>
</mapper>

1
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.java

@ -39,6 +39,7 @@ public interface TrunklineCarsLoadMapper extends BaseMapper<TrunklineCarsLoadEnt
List<CarsLoadAllOrderVO> findUseOrderListNoPage(@Param("param") LoadCarsDTO loadCarsDTO);
IPage<JSONObject> findZeroListByWarehouseId(IPage<Object> page, @Param("param") LoadCarsDTO loadCarsDTO);
IPage<JSONObject> findSignOrderZeroListByWarehouseId(IPage<Object> page, @Param("param") LoadCarsDTO loadCarsDTO);
IPage<JSONObject> useZeroList(IPage<Object> page, @Param("param") LoadCarsDTO loadCarsDTO);

53
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml

@ -685,4 +685,57 @@
</if>
</update>
<select id="findSignOrderZeroListByWarehouseId" resultType="com.alibaba.fastjson.JSONObject">
select ldsa.waybill_number waybillNo,
ldsa.order_code orderCode,
ldsa.hand_quantity handQuantity,
lww.create_time createTime,
lww.destination destination,
lww.destination_warehouse_name destinationWarehouseName,
lww.shipper shipper,
lww.shipper_name shipperName,
lww.consignee consignee,
lww.consignee_name consigneeName,
lww.goods_name goodsName,
lww.total_count totalNum,
lww.total_weight weight,
lww.total_volume volume,
ldsa.hand_quantity stockNum,
lww.customer_train customerTrain,
IFNULL(lww.total_freight,0) totalFreight,
lww.total_count,
lww.remark remark,
ROUND(lww.total_freight/lww.total_count,2) price,
ltlso.load_sign_code loadSignCode,
ltlso.id signOrderId
from logpm_trunkline_load_sign_order ltlso
left join logpm_trunkline_cars_order ltco on ltco.sign_order_id = ltlso.id
left join logpm_distribution_stock_article ldsa on ldsa.order_code = ltco.order_code and ldsa.warehouse_id = ltco.node_id
left join logpm_warehouse_waybill lww on lww.waybill_no = ldsa.waybill_number
where ldsa.is_zero = 1
and lww.destination_warehouse_id != #{param.warehouseId}
and ldsa.hand_quantity > 0
and ldsa.warehouse_id = #{param.warehouseId}
<if test="param.signOrderId != null">
and ltlso.id = #{param.signOrderId}
</if>
<if test="param.orderCodes != null and param.orderCodes.size() > 0">
and ldsa.order_code not in
<foreach collection="param.orderCodes" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="param.orderCodeList != null and param.orderCodeList.size() > 0">
and ldsa.order_code in
<foreach collection="param.orderCodeList" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="param.waybillNo != null and param.waybillNo != ''">
and Locate(#{param.waybillNo},lww.waybill_no) > 0
</if>
</select>
</mapper>

12
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml

@ -679,24 +679,30 @@
when '2' then '卸车'
when '3' then '签收'
end scanStatus,
lww.destination_warehouse_name destinationWarehouseName,
ltcls.tray_name trayName,
ltcls.tray_code trayCode,
ltcls.unload_node_name unloadNodeName,
ltcls.unload_user_name unloadUserName,
ltcls.unload_time unloadTime,
case ltcls.type
when 1 then '订制品'
when 2 then '零担'
end type,
ltcls.num num,
IF(ltcls.is_data = 1,'有','无') isData,
ltcls.unload_num unloadNum,
IF(ltcls.is_data = 1,'有数据','无数据') isData,
IF(ltcls.loading_abnormal = 1,'是','否') loadingAbnormal,
IF(ltcls.unload_abnormal = 1,'是','否') unloadAbnormal,
IF(ltcls.is_supple = 1,'是','否') isSupple,
ltcls.create_time loadingTime,
ltcls.unload_time unloadTime
ltcls.sign_user_name signUserName,
ltcls.sign_time signTime
from logpm_trunkline_cars_load_scan ltcls
left join logpm_warehouse_waybill lww on ltcls.waybill_id = lww.id
where ltcls.load_id = #{param.loadId}
order by ltcls.create_time asc
order by ltcls.loading_abnormal desc,ltcls.unload_abnormal desc,ltcls.create_time asc
</select>
<select id="findSignNumByLoadId" resultType="int">

3
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceDetailService.java

@ -9,7 +9,6 @@ import com.logpm.trunkline.vo.AdvanceDetailGoodsVO;
import com.logpm.trunkline.vo.AdvanceDetailStockNumVO;
import com.logpm.trunkline.vo.BillladingPackageVO;
import com.logpm.trunkline.vo.TrunklineAdvanceDetailVO;
import org.apache.ibatis.annotations.Delete;
import org.springblade.core.mp.base.BaseService;
import org.springblade.core.tool.api.R;
@ -84,4 +83,6 @@ public interface ITrunklineAdvanceDetailService extends BaseService<TrunklineAdv
void deletedAdvanceByOrderCode(String orderCode);
void deleteByWaybillNo(String waybillNo);
List<TrunklineAdvanceDetailEntity> findListByOrderPackageCodeList(List<String> orderPackageCodes);
}

6
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineBillladingService.java

@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.logpm.trunkline.dto.BillladingDTO;
import com.logpm.trunkline.dto.BillladingWaybillDTO;
import com.logpm.trunkline.entity.TrunklineBillladingEntity;
import com.logpm.trunkline.vo.BillladingWaybillExportVO;
import com.logpm.trunkline.vo.TrunklineBillladingDetailListVO;
import com.logpm.trunkline.vo.TrunklineBillladingExportVO;
import com.logpm.trunkline.vo.TrunklineBillladingVO;
import org.springblade.core.mp.base.BaseService;
import org.springblade.core.tool.api.R;
@ -15,6 +17,8 @@ public interface ITrunklineBillladingService extends BaseService<TrunklineBillla
IPage<TrunklineBillladingVO> pageList(BillladingDTO billladingDTO);
List<TrunklineBillladingExportVO> pageListExport(BillladingDTO billladingDTO);
void saveNew(BillladingDTO billladingDTO,String warehouseCode);
IPage<TrunklineBillladingVO> pageInfoList(BillladingDTO billladingDTO);
@ -47,4 +51,6 @@ public interface ITrunklineBillladingService extends BaseService<TrunklineBillla
R findBillladingLogList(Long billladingId);
List<BillladingWaybillExportVO> billladingDetailExport(Long billladingId);
}

3
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineBillladingWaybillService.java

@ -3,6 +3,7 @@ package com.logpm.trunkline.service;
import com.logpm.trunkline.entity.TrunklineBillladingEntity;
import com.logpm.trunkline.entity.TrunklineBillladingWaybillEntity;
import com.logpm.trunkline.entity.TrunklineWaybillOrderEntity;
import com.logpm.trunkline.vo.BillladingWaybillExportVO;
import com.logpm.trunkline.vo.TrunklineBillladingNumVO;
import com.logpm.trunkline.vo.TrunklineBillladingWaybillVO;
import org.springblade.core.mp.base.BaseService;
@ -41,4 +42,6 @@ public interface ITrunklineBillladingWaybillService extends BaseService<Trunklin
TrunklineBillladingNumVO getNumVOByBillladingId(Long billladingId);
List<TrunklineBillladingWaybillEntity> getNoDataWaybillByBillladingIds(List<Long> billladingIds);
List<BillladingWaybillExportVO> findWaybillInfoListByBillladingIdExport(Long billladingId);
}

2
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadService.java

@ -221,4 +221,6 @@ public interface ITrunklineCarsLoadService extends BaseService<TrunklineCarsLoad
R adnormalHasStock(Long carsLoadScanId, Long warehouseId);
R selectEditDetailByLoadIdNoXz(Long loadId);
R signOrderZeroSuppleList(LoadCarsDTO loadCarsDTO);
}

15
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java

@ -2,6 +2,7 @@ package com.logpm.trunkline.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.logpm.basicdata.entity.BasicdataStorageServicesEntity;
@ -349,6 +350,13 @@ public class InComingServiceImpl implements IInComingService {
int code = r.getCode();
if(code != 200){
audio.set(r.getMsg());
}else{
String data = (String) r.getData();
if(StringUtil.isNotBlank(data)){
JSONObject parseObj = JSONUtil.parseObj(data);
String audio1 = parseObj.getStr("audio");
audio.set(audio1);
}
}
}
});
@ -447,6 +455,13 @@ public class InComingServiceImpl implements IInComingService {
int code = r.getCode();
if(code != 200){
audio.set(r.getMsg());
}else{
String data = (String) r.getData();
if(StringUtil.isNotBlank(data)){
JSONObject parseObj = JSONUtil.parseObj(data);
String audio1 = parseObj.getStr("audio");
audio.set(audio1);
}
}
}
});

8
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java

@ -342,4 +342,12 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl<Trunkline
public void deleteByWaybillNo(String waybillNo) {
baseMapper.deleteByWaybillNo(waybillNo);
}
@Override
public List<TrunklineAdvanceDetailEntity> findListByOrderPackageCodeList(List<String> orderPackageCodes) {
QueryWrapper<TrunklineAdvanceDetailEntity> queryWrapper = new QueryWrapper();
queryWrapper.in("order_package_code", orderPackageCodes);
List<TrunklineAdvanceDetailEntity> advanceDetailEntities = baseMapper.selectList(queryWrapper);
return advanceDetailEntities;
}
}

13
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingServiceImpl.java

@ -64,6 +64,14 @@ public class TrunklineBillladingServiceImpl extends BaseServiceImpl<TrunklineBil
return baseMapper.pageList(page,billladingDTO);
}
@Override
public List<TrunklineBillladingExportVO> pageListExport(BillladingDTO billladingDTO) {
return baseMapper.pageListExport(billladingDTO);
}
@Override
public void saveNew(BillladingDTO billladingDTO,String warehouseCode) {
log.info("###############saveNew: billladingDTO={}",billladingDTO);
@ -828,4 +836,9 @@ public class TrunklineBillladingServiceImpl extends BaseServiceImpl<TrunklineBil
return R.data(list);
}
@Override
public List<BillladingWaybillExportVO> billladingDetailExport(Long billladingId) {
return billladingWaybillService.findWaybillInfoListByBillladingIdExport(billladingId);
}
}

6
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingWaybillServiceImpl.java

@ -6,6 +6,7 @@ import com.logpm.trunkline.entity.TrunklineBillladingWaybillEntity;
import com.logpm.trunkline.entity.TrunklineWaybillOrderEntity;
import com.logpm.trunkline.mapper.TrunklineBillladingWaybillMapper;
import com.logpm.trunkline.service.ITrunklineBillladingWaybillService;
import com.logpm.trunkline.vo.BillladingWaybillExportVO;
import com.logpm.trunkline.vo.TrunklineBillladingNumVO;
import com.logpm.trunkline.vo.TrunklineBillladingWaybillVO;
import lombok.AllArgsConstructor;
@ -160,4 +161,9 @@ public class TrunklineBillladingWaybillServiceImpl extends BaseServiceImpl<Trunk
return baseMapper.selectList(queryWrapper);
}
@Override
public List<BillladingWaybillExportVO> findWaybillInfoListByBillladingIdExport(Long billladingId) {
return baseMapper.findWaybillInfoListByBillladingIdExport(billladingId);
}
}

14
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java

@ -76,8 +76,6 @@ import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
import static cn.hutool.poi.excel.sax.AttributeName.s;
@Slf4j
@Service
@AllArgsConstructor
@ -1514,6 +1512,18 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
return R.data(map);
}
@Override
public R signOrderZeroSuppleList(LoadCarsDTO loadCarsDTO) {
IPage<Object> page = new Page<>();
page.setCurrent(loadCarsDTO.getPageNum());
page.setSize(loadCarsDTO.getPageSize());
//查询当前仓零担在库列表
// IPage<JSONObject> pageList = distributionStockArticleClient.findZeroListByWarehouseId(warehouseId,pageNum,pageSize);
IPage<JSONObject> pageList = baseMapper.findSignOrderZeroListByWarehouseId(page, loadCarsDTO);
return R.data(pageList);
}
@Transactional(rollbackFor = Exception.class)
@Override

24
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineWaybillPackageServiceImpl.java

@ -2,9 +2,13 @@ package com.logpm.trunkline.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
import com.logpm.trunkline.entity.TrunklineAdvanceDetailEntity;
import com.logpm.trunkline.entity.TrunklineWaybillPackageEntity;
import com.logpm.trunkline.mapper.TrunklineWaybillPackageMapper;
import com.logpm.trunkline.service.IPackageTrackLogAsyncService;
import com.logpm.trunkline.service.ITrunklineAdvanceDetailService;
import com.logpm.trunkline.service.ITrunklineWaybillPackageService;
import com.logpm.trunkline.vo.TrunklineAdvanceDetailVO;
import com.logpm.warehouse.entity.WarehouseWaybillEntity;
@ -31,6 +35,13 @@ public class TrunklineWaybillPackageServiceImpl extends BaseServiceImpl<Trunklin
@Resource
private IWarehouseWaybillClient warehouseWaybillClient;
@Resource
private ITrunklineAdvanceDetailService advanceDetailService;
@Resource
private IBasicdataWarehouseClient warehouseClient;
@Override
public void saveList(List<TrunklineAdvanceDetailVO> list, WarehouseWaybillEntity waybillEntity) {
Long waybillId = waybillEntity.getId();
@ -155,6 +166,19 @@ public class TrunklineWaybillPackageServiceImpl extends BaseServiceImpl<Trunklin
@Override
public void updatePackageStatus(List<String> orderPackageCodes, Integer workNode, Long warehouseId, Map<String, JSONObject> map) {
BasicdataWarehouseEntity warehouseEntity = warehouseClient.getEntityWarehouseId(warehouseId);
if(!Objects.isNull(warehouseEntity)){
//更新所有包件的当前所在仓
List<TrunklineAdvanceDetailEntity> advanceDetailEntities = advanceDetailService.findListByOrderPackageCodeList(orderPackageCodes);
advanceDetailEntities.forEach(advanceDetailEntity -> {
advanceDetailEntity.setNowWarehouseId(warehouseId);
advanceDetailEntity.setNowWarehouseName(warehouseEntity.getName());
});
advanceDetailService.updateBatchById(advanceDetailEntities);
}
Integer packageStatus = null;
if(WorkNodeEnums.INITIAL_WAREHOUSE_DEPART.getCode().equals(workNode)){
//始发仓发车

Loading…
Cancel
Save