72 changed files with 3020 additions and 124 deletions
@ -0,0 +1,43 @@
|
||||
package org.springblade.common.constant.driver; |
||||
/* |
||||
* logisticsplatform-service |
||||
* @Author Diss |
||||
* @Create 2024/1/12 15:32 |
||||
*/ |
||||
|
||||
/** |
||||
* ApprovedDrivingModel |
||||
*/ |
||||
public enum DriverApprovedDrivingModelConstant { |
||||
//准驾车型;1-A1,2-A2,3-A3,4-B1,5-B2,6-C1,7-C2
|
||||
A1("A1", "1"), |
||||
A2("A2", "2"), |
||||
A3("A3", "3"), |
||||
B1("B1", "4"), |
||||
B2("B2", "5"), |
||||
C1("C1", "6"), |
||||
C2("C2", "7"); |
||||
private String name; |
||||
private String value; |
||||
|
||||
DriverApprovedDrivingModelConstant(String name, String value) { |
||||
this.name = name; |
||||
this.value = value; |
||||
} |
||||
|
||||
public String getName() { |
||||
return name; |
||||
} |
||||
|
||||
public void setName(String name) { |
||||
this.name = name; |
||||
} |
||||
|
||||
public String getValue() { |
||||
return value; |
||||
} |
||||
|
||||
public void setValue(String value) { |
||||
this.value = value; |
||||
} |
||||
} |
||||
@ -0,0 +1,48 @@
|
||||
package org.springblade.common.constant.driver; |
||||
/* |
||||
* logisticsplatform-service |
||||
* @Author Diss |
||||
* @Create 2024/1/12 15:34 |
||||
*/ |
||||
|
||||
/** |
||||
* BankType |
||||
*/ |
||||
public enum DriverBankTypeConverter { |
||||
//银行类型;1-工商银行,2-建设银行,3-农业银行,4-邮政银行,5-中国银行,6-交通银行,7-其他
|
||||
ICBC("工商银行","1"), |
||||
//2-建设银行
|
||||
CCB("建设银行","2"), |
||||
//3-农业银行
|
||||
ABC("农业银行","3"), |
||||
//4-邮政银行
|
||||
POST("邮政银行","4"), |
||||
//5-中国银行
|
||||
BANK("中国银行","5"), |
||||
//6-交通银行
|
||||
JHB("交通银行","6"), |
||||
//7-其他
|
||||
OTHER("其他","7"); |
||||
private String name; |
||||
private String value; |
||||
DriverBankTypeConverter(String name, String value) { |
||||
this.name = name; |
||||
this.value = value; |
||||
} |
||||
|
||||
public String getName() { |
||||
return name; |
||||
} |
||||
|
||||
public void setName(String name) { |
||||
this.name = name; |
||||
} |
||||
|
||||
public String getValue() { |
||||
return value; |
||||
} |
||||
|
||||
public void setValue(String value) { |
||||
this.value = value; |
||||
} |
||||
} |
||||
@ -0,0 +1,36 @@
|
||||
package org.springblade.common.constant.driver; |
||||
/* |
||||
* logisticsplatform-service |
||||
* @Author Diss |
||||
* @Create 2024/1/12 15:28 |
||||
*/ |
||||
|
||||
public enum DriverPositionTypeConstant { |
||||
//职务类型;1-干线,2-配送
|
||||
ganxian("干线", "1"), |
||||
peisong("配送", "2"); |
||||
private String name; |
||||
private String value; |
||||
|
||||
DriverPositionTypeConstant(String name, String value) { |
||||
this.name = name; |
||||
this.value = value; |
||||
} |
||||
|
||||
public String getName() { |
||||
return name; |
||||
} |
||||
|
||||
public void setName(String name) { |
||||
this.name = name; |
||||
} |
||||
|
||||
public String getValue() { |
||||
return value; |
||||
} |
||||
|
||||
public void setValue(String value) { |
||||
this.value = value; |
||||
} |
||||
|
||||
} |
||||
@ -0,0 +1,40 @@
|
||||
package org.springblade.common.constant.driver; |
||||
/* |
||||
* logisticsplatform-service |
||||
* @Author Diss |
||||
* @Create 2024/1/12 15:19 |
||||
*/ |
||||
|
||||
/** |
||||
* 司机类型的状态 |
||||
*/ |
||||
public enum DriverTypeStatusConstant { |
||||
//司机类型;1-自有,2-加盟,3-外调,4-临调
|
||||
ziyou("自有", "1"), |
||||
jiamao("加盟", "2"), |
||||
waifang("外调", "3"), |
||||
lincha("临调", "4"); |
||||
private String name; |
||||
private String value; |
||||
|
||||
DriverTypeStatusConstant(String name, String value) { |
||||
this.name = name; |
||||
this.value = value; |
||||
} |
||||
|
||||
public String getName() { |
||||
return name; |
||||
} |
||||
|
||||
public void setName(String name) { |
||||
this.name = name; |
||||
} |
||||
|
||||
public String getValue() { |
||||
return value; |
||||
} |
||||
|
||||
public void setValue(String value) { |
||||
this.value = value; |
||||
} |
||||
} |
||||
@ -0,0 +1,20 @@
|
||||
package com.logpm.trunkline.dto; |
||||
|
||||
import lombok.Data; |
||||
|
||||
import java.io.Serializable; |
||||
import java.util.ArrayList; |
||||
import java.util.List; |
||||
|
||||
@Data |
||||
public class BatchUnloadDTO implements Serializable { |
||||
|
||||
private Long loadId; |
||||
|
||||
private Long warehouseId; |
||||
|
||||
private List<UnloadPackageDTO> unloadPackageList = new ArrayList<>(); |
||||
|
||||
private List<UnloadZeroDTO> unloadZeroList = new ArrayList<>(); |
||||
|
||||
} |
||||
@ -0,0 +1,12 @@
|
||||
package com.logpm.trunkline.dto; |
||||
|
||||
import lombok.Data; |
||||
|
||||
import java.io.Serializable; |
||||
|
||||
@Data |
||||
public class UnloadPackageDTO implements Serializable { |
||||
|
||||
private String orderPackageCode; |
||||
|
||||
} |
||||
@ -0,0 +1,15 @@
|
||||
package com.logpm.trunkline.dto; |
||||
|
||||
import lombok.Data; |
||||
|
||||
import java.io.Serializable; |
||||
|
||||
@Data |
||||
public class UnloadZeroDTO implements Serializable { |
||||
|
||||
private String waybillNo; |
||||
private Integer enterNum; |
||||
private String trayCode; |
||||
private String orderCode; |
||||
|
||||
} |
||||
@ -0,0 +1,86 @@
|
||||
package com.logpm.trunkline.entity; |
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableName; |
||||
import io.swagger.annotations.ApiModel; |
||||
import io.swagger.annotations.ApiModelProperty; |
||||
import lombok.Data; |
||||
import lombok.EqualsAndHashCode; |
||||
import org.springblade.core.tenant.mp.TenantEntity; |
||||
|
||||
@Data |
||||
@TableName("logpm_trunkline_cars_sign_log") |
||||
@ApiModel(value = "TrunklineCarsSignLog对象", description = "干线签收记录表") |
||||
@EqualsAndHashCode(callSuper = true) |
||||
public class TrunklineCarsSignLogEntity extends TenantEntity { |
||||
|
||||
/** 预留1 */ |
||||
@ApiModelProperty(name = "预留1",notes = "") |
||||
private String reserve1 ; |
||||
/** 预留2 */ |
||||
@ApiModelProperty(name = "预留2",notes = "") |
||||
private String reserve2 ; |
||||
/** 预留3 */ |
||||
@ApiModelProperty(name = "预留3",notes = "") |
||||
private String reserve3 ; |
||||
/** 预留4 */ |
||||
@ApiModelProperty(name = "预留4",notes = "") |
||||
private String reserve4 ; |
||||
/** 预留5 */ |
||||
@ApiModelProperty(name = "预留5",notes = "") |
||||
private String reserve5 ; |
||||
/** 仓库id */ |
||||
@ApiModelProperty(name = "仓库id",notes = "") |
||||
private Long warehouseId ; |
||||
/** 仓库名称 */ |
||||
@ApiModelProperty(name = "仓库名称",notes = "") |
||||
private String warehouseName ; |
||||
/** 配载id */ |
||||
@ApiModelProperty(name = "配载id",notes = "") |
||||
private Long loadId ; |
||||
/** 配载批次号 */ |
||||
@ApiModelProperty(name = "配载批次号",notes = "") |
||||
private String loadCode ; |
||||
/** 运单id */ |
||||
@ApiModelProperty(name = "运单id",notes = "") |
||||
private Long waybillId ; |
||||
/** 运单号 */ |
||||
@ApiModelProperty(name = "运单号",notes = "") |
||||
private String waybillNo ; |
||||
/** 订单号 */ |
||||
@ApiModelProperty(name = "订单号",notes = "") |
||||
private String orderCode ; |
||||
/** 包件码/品类名 */ |
||||
@ApiModelProperty(name = "包件码/品类名",notes = "") |
||||
private String scanCode ; |
||||
/** 数量 */ |
||||
@ApiModelProperty(name = "数量",notes = "") |
||||
private Integer num ; |
||||
/** 类型 1订制品 2零担 */ |
||||
@ApiModelProperty(name = "类型 1订制品 2零担",notes = "") |
||||
private Integer type ; |
||||
/** 有无数据 1有 0无 */ |
||||
@ApiModelProperty(name = "有无数据 1有 0无",notes = "") |
||||
private Integer isData ; |
||||
/** 是否异常 1是 0否 */ |
||||
@ApiModelProperty(name = "是否异常 1是 0否",notes = "") |
||||
private Integer isAbnormal ; |
||||
/** 托盘码 */ |
||||
@ApiModelProperty(name = "托盘码",notes = "") |
||||
private String trayCode ; |
||||
/** 托盘名称 */ |
||||
@ApiModelProperty(name = "托盘名称",notes = "") |
||||
private String trayName ; |
||||
/** 托盘id */ |
||||
@ApiModelProperty(name = "托盘id",notes = "") |
||||
private Long trayId ; |
||||
/** 来源仓库id */ |
||||
@ApiModelProperty(name = "来源仓库id",notes = "") |
||||
private Long fromWarehouseId ; |
||||
/** 装车记录id */ |
||||
@ApiModelProperty(name = "装车记录id",notes = "") |
||||
private Long loadScanId ; |
||||
/** 备注 */ |
||||
@ApiModelProperty(name = "备注",notes = "") |
||||
private String remark ; |
||||
|
||||
} |
||||
@ -0,0 +1,84 @@
|
||||
package com.logpm.trunkline.entity; |
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableName; |
||||
import io.swagger.annotations.ApiModel; |
||||
import io.swagger.annotations.ApiModelProperty; |
||||
import lombok.Data; |
||||
import lombok.EqualsAndHashCode; |
||||
import org.springblade.core.tenant.mp.TenantEntity; |
||||
|
||||
@Data |
||||
@TableName("logpm_trunkline_load_sign_order") |
||||
@ApiModel(value = "TrunklineLoadSignOrder对象", description = "配载计划直发签收单") |
||||
@EqualsAndHashCode(callSuper = true) |
||||
public class TrunklineLoadSignOrderEntity extends TenantEntity { |
||||
|
||||
/** 预留1 */ |
||||
@ApiModelProperty(name = "预留1",notes = "") |
||||
private String reserve1 ; |
||||
/** 预留2 */ |
||||
@ApiModelProperty(name = "预留2",notes = "") |
||||
private String reserve2 ; |
||||
/** 预留3 */ |
||||
@ApiModelProperty(name = "预留3",notes = "") |
||||
private String reserve3 ; |
||||
/** 预留4 */ |
||||
@ApiModelProperty(name = "预留4",notes = "") |
||||
private String reserve4 ; |
||||
/** 预留5 */ |
||||
@ApiModelProperty(name = "预留5",notes = "") |
||||
private String reserve5 ; |
||||
|
||||
/** 配载id */ |
||||
@ApiModelProperty(name = "配载id",notes = "") |
||||
private Long loadId ; |
||||
|
||||
/** 节点id */ |
||||
@ApiModelProperty(name = "节点id",notes = "") |
||||
private Long warehouseId; |
||||
|
||||
/** 商家名称 */ |
||||
@ApiModelProperty(name = "商家名称",notes = "") |
||||
private String mallName; |
||||
|
||||
/** 商家收货人 */ |
||||
@ApiModelProperty(name = "商家收货人",notes = "") |
||||
private String mallPerson; |
||||
|
||||
/** 商家收货人电话 */ |
||||
@ApiModelProperty(name = "商家收货人电话",notes = "") |
||||
private String mallMobile; |
||||
|
||||
/** 商家收货地址 */ |
||||
@ApiModelProperty(name = "商家收货地址",notes = "") |
||||
private String mallAddress; |
||||
|
||||
/** 签收单归属仓库id */ |
||||
@ApiModelProperty(name = "签收单归属仓库id",notes = "") |
||||
private Long belongToWarehouseId; |
||||
|
||||
/** 签收单归属仓库名称 */ |
||||
@ApiModelProperty(name = "签收单归属仓库名称",notes = "") |
||||
private String belongToWarehouseName; |
||||
|
||||
/** 签收单计划件数 */ |
||||
@ApiModelProperty(name = "签收单计划件数",notes = "") |
||||
private Integer planNum; |
||||
|
||||
/** 签收单装车件数 */ |
||||
@ApiModelProperty(name = "签收单装车件数",notes = "") |
||||
private Integer loadingNum; |
||||
|
||||
/** 签收单签收件数 */ |
||||
@ApiModelProperty(name = "签收单签收件数",notes = "") |
||||
private Integer signNum; |
||||
|
||||
/** 签收单签收状态 */ |
||||
@ApiModelProperty(name = "签收单签收状态",notes = "") |
||||
private String signStatus;// 0未签收 10部分签收 20已签收
|
||||
|
||||
/** 签收单号 */ |
||||
@ApiModelProperty(name = "签收单号",notes = "") |
||||
private String loadSignCode; |
||||
|
||||
} |
||||
@ -0,0 +1,27 @@
|
||||
package com.logpm.trunkline.vo; |
||||
|
||||
import lombok.Data; |
||||
|
||||
import java.io.Serializable; |
||||
|
||||
@Data |
||||
public class SignOrderDetailVO implements Serializable { |
||||
|
||||
private Long loadScanId; |
||||
private String carsNo; |
||||
private String waybillNo; |
||||
private String orderCode; |
||||
private String warehouseName; |
||||
private String mallName; |
||||
private String mallPerson; |
||||
private String mallMobile; |
||||
private String mallAddress; |
||||
private String scanCode; |
||||
private String scanStatus; |
||||
private Integer type; |
||||
private Integer num; |
||||
private Integer unloadNum; |
||||
private String remark; |
||||
private Long signOrderId; |
||||
|
||||
} |
||||
@ -0,0 +1,12 @@
|
||||
package com.logpm.trunkline.vo; |
||||
|
||||
import java.io.Serializable; |
||||
|
||||
public class SignPackageVO implements Serializable { |
||||
|
||||
private String orderPackageCode; |
||||
private Integer num; |
||||
private Integer unloadNum; |
||||
private String scanStatus; |
||||
|
||||
} |
||||
@ -0,0 +1,20 @@
|
||||
package com.logpm.trunkline.vo; |
||||
|
||||
import lombok.Data; |
||||
|
||||
import java.io.Serializable; |
||||
import java.util.ArrayList; |
||||
import java.util.List; |
||||
|
||||
@Data |
||||
public class SignScanOrderVO implements Serializable { |
||||
|
||||
private String waybillNo; |
||||
private String orderCode; |
||||
private Integer loadingNum; |
||||
private Integer signNum; |
||||
|
||||
private List<SignPackageVO> signPackageList = new ArrayList<>(); |
||||
|
||||
|
||||
} |
||||
@ -0,0 +1,12 @@
|
||||
package com.logpm.trunkline.vo; |
||||
|
||||
import com.logpm.trunkline.entity.TrunklineLoadSignOrderEntity; |
||||
import lombok.Data; |
||||
|
||||
@Data |
||||
public class TrunklineLoadSignOrderVO extends TrunklineLoadSignOrderEntity { |
||||
|
||||
private String driverName; |
||||
private String carsNo; |
||||
|
||||
} |
||||
@ -0,0 +1,9 @@
|
||||
package com.logpm.trunkline.mapper; |
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
||||
import com.logpm.trunkline.entity.TrunklineCarsSignLogEntity; |
||||
import org.apache.ibatis.annotations.Mapper; |
||||
|
||||
@Mapper |
||||
public interface TrunklineCarsSignLogMapper extends BaseMapper<TrunklineCarsSignLogEntity> { |
||||
} |
||||
@ -0,0 +1,27 @@
|
||||
package com.logpm.trunkline.mapper; |
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import com.logpm.trunkline.dto.LoadCarsDTO; |
||||
import com.logpm.trunkline.entity.TrunklineLoadSignOrderEntity; |
||||
import com.logpm.trunkline.vo.SignOrderDetailVO; |
||||
import com.logpm.trunkline.vo.TrunklineLoadSignOrderVO; |
||||
import org.apache.ibatis.annotations.Mapper; |
||||
import org.apache.ibatis.annotations.Param; |
||||
|
||||
import java.util.List; |
||||
|
||||
@Mapper |
||||
public interface TrunklineLoadSignOrderMapper extends BaseMapper<TrunklineLoadSignOrderEntity> { |
||||
List<TrunklineLoadSignOrderEntity> findAllLoadSignOrderList(@Param("loadId") Long loadId, @Param("warehouseId") Long warehouseId); |
||||
|
||||
void deleteListBySignStatusAndLoadIdAndWarehouseId(@Param("loadId") Long loadId, @Param("warehouseId") Long warehouseId); |
||||
|
||||
IPage<TrunklineLoadSignOrderVO> finaSignOrderList(IPage<Object> page, @Param("param") LoadCarsDTO loadCarsDTO); |
||||
|
||||
TrunklineLoadSignOrderVO finaSignOrderDetail(@Param("signOrderId") Long signOrderId); |
||||
|
||||
IPage<SignOrderDetailVO> findSignOrderDetailList(IPage<Object> page, @Param("param") LoadCarsDTO loadCarsDTO); |
||||
|
||||
void updateBelongToWarehouse(@Param("signOrderId") Long signOrderId, @Param("warehouseId") Long warehouseId, @Param("warehouseName") String warehouseName); |
||||
} |
||||
@ -0,0 +1,75 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?> |
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> |
||||
<mapper namespace="com.logpm.trunkline.mapper.TrunklineLoadSignOrderMapper"> |
||||
|
||||
<select id="findAllLoadSignOrderList" resultType="com.logpm.trunkline.entity.TrunklineLoadSignOrderEntity"> |
||||
select * |
||||
from logpm_trunkline_load_sign_order ltlso |
||||
where ltlso.load_id = #{loadId} |
||||
and ltlso.warehouse_id = #{warehouseId} |
||||
</select> |
||||
|
||||
<delete id="deleteListBySignStatusAndLoadIdAndWarehouseId" > |
||||
delete from logpm_trunkline_load_sign_order |
||||
where load_id = #{loadId} |
||||
and warehouse_id = #{warehouseId} |
||||
and sign_status = 0 |
||||
</delete> |
||||
|
||||
<select id="finaSignOrderList" resultType="com.logpm.trunkline.vo.TrunklineLoadSignOrderVO"> |
||||
select ltlso.* |
||||
ltcl.driver_name driverName |
||||
from logpm_trunkline_load_sign_order ltlso |
||||
left join logpm_trunkline_cars_load ltcl on ltcl.id = ltlso.load_id |
||||
where ltlso.load_id = #{param.loadId} |
||||
and ltlso.warehouse_id = #{param.warehouseId} |
||||
and ltcl.driver_id = #{param.driverId} |
||||
<if test="param.signStatus = '20'"> |
||||
and ltlso.sign_status = '20' |
||||
</if> |
||||
<if test="param.signStatus = '10'"> |
||||
and ltlso.sign_status != '20' |
||||
</if> |
||||
|
||||
</select> |
||||
|
||||
<select id="finaSignOrderDetail" resultType="com.logpm.trunkline.vo.TrunklineLoadSignOrderVO"> |
||||
select ltlso.* |
||||
ltcl.driver_name driverName, |
||||
ltcl.cars_no carsNo |
||||
from logpm_trunkline_load_sign_order ltlso |
||||
left join logpm_trunkline_cars_load ltcl on ltcl.id = ltlso.load_id |
||||
where ltlso.id = #{signOrderId} |
||||
</select> |
||||
|
||||
<select id="findSignOrderDetailList" resultType="com.logpm.trunkline.vo.SignOrderDetailVO"> |
||||
select ltcls.id loadScanId, |
||||
ltcls.waybill_no waybillNo, |
||||
ltcls.order_code orderCode, |
||||
ltcls.warehouse_name warehouseName, |
||||
ldsa.mall_name mallName, |
||||
ldsa.consignee_person mallPerson, |
||||
ldsa.consignee_mobile mallMobile, |
||||
ldsa.consignee_address mallAddress, |
||||
ltcls.scan_code scanCode, |
||||
ltcls.scan_status scanStatus, |
||||
ltcls.type type, |
||||
ltcls.num num, |
||||
ltcls.unload_num unloadNum, |
||||
ltcls.remark remak, |
||||
ltco.sign_order_id signOrderId |
||||
from logpm_trunkline_cars_order ltco |
||||
left join logpm_trunkline_cars_load_scan ltcls on ltco.load_id = ltcls.load_id and ltco.node_id = ltcls.warehouse_id and ltcls.order_code = ltco.order_code and ltcls.waybill_no = ltco.waybill_no |
||||
left join logpm_distribution_stock_article ldsa on ldsa.order_code = ltco.order_code and ldsa.warehouse_id = ltco.node_id |
||||
where ltco.sign_order_id = #{param.signOrderId} |
||||
and ltco.is_customer = '1' |
||||
</select> |
||||
|
||||
<update id="updateBelongToWarehouse"> |
||||
update logpm_trunkline_load_sign_order |
||||
set belong_to_warehouse_id = #{warehouseId}, |
||||
belong_to_warehouse_name = #{warehouseName} |
||||
where id = #{signOrderId} |
||||
</update> |
||||
|
||||
</mapper> |
||||
@ -0,0 +1,10 @@
|
||||
package com.logpm.trunkline.service; |
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService; |
||||
import com.logpm.trunkline.entity.TrunklineCarsLoadScanEntity; |
||||
import com.logpm.trunkline.entity.TrunklineCarsSignLogEntity; |
||||
|
||||
public interface ITrunklineCarsSignLogService extends IService<TrunklineCarsSignLogEntity> { |
||||
void addEntity(TrunklineCarsLoadScanEntity carsLoadScanEntity,String remark); |
||||
|
||||
} |
||||
@ -0,0 +1,24 @@
|
||||
package com.logpm.trunkline.service; |
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import com.baomidou.mybatisplus.extension.service.IService; |
||||
import com.logpm.trunkline.dto.LoadCarsDTO; |
||||
import com.logpm.trunkline.entity.TrunklineLoadSignOrderEntity; |
||||
import com.logpm.trunkline.vo.SignOrderDetailVO; |
||||
import com.logpm.trunkline.vo.TrunklineLoadSignOrderVO; |
||||
|
||||
import java.util.List; |
||||
|
||||
public interface ITrunklineLoadSignOrderService extends IService<TrunklineLoadSignOrderEntity> { |
||||
List<TrunklineLoadSignOrderEntity> findAllLoadSignOrderList(Long loadId, Long warehouseId); |
||||
|
||||
void deleteListBySignStatusAndLoadIdAndWarehouseId(Long loadId, Long warehouseId); |
||||
|
||||
IPage<TrunklineLoadSignOrderVO> finaSignOrderList(IPage<Object> page, LoadCarsDTO loadCarsDTO); |
||||
|
||||
TrunklineLoadSignOrderVO finaSignOrderDetail(Long signOrderId); |
||||
|
||||
IPage<SignOrderDetailVO> findSignOrderDetailList(IPage<Object> page, LoadCarsDTO loadCarsDTO); |
||||
|
||||
void updateBelongToWarehouse(Long signOrderId, Long warehouseId, String warehouseName); |
||||
} |
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,39 @@
|
||||
package com.logpm.trunkline.service.impl; |
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
||||
import com.logpm.trunkline.entity.TrunklineCarsLoadScanEntity; |
||||
import com.logpm.trunkline.entity.TrunklineCarsSignLogEntity; |
||||
import com.logpm.trunkline.mapper.TrunklineCarsSignLogMapper; |
||||
import com.logpm.trunkline.service.ITrunklineCarsSignLogService; |
||||
import lombok.AllArgsConstructor; |
||||
import lombok.extern.slf4j.Slf4j; |
||||
import org.springframework.stereotype.Service; |
||||
|
||||
@Slf4j |
||||
@Service |
||||
@AllArgsConstructor |
||||
public class TrunklineCarsSignLogServiceImpl extends ServiceImpl<TrunklineCarsSignLogMapper, TrunklineCarsSignLogEntity> implements ITrunklineCarsSignLogService { |
||||
@Override |
||||
public void addEntity(TrunklineCarsLoadScanEntity carsLoadScanEntity,String remark) { |
||||
TrunklineCarsSignLogEntity trunklineCarsSignLogEntity = new TrunklineCarsSignLogEntity(); |
||||
trunklineCarsSignLogEntity.setLoadId(carsLoadScanEntity.getLoadId()); |
||||
trunklineCarsSignLogEntity.setLoadCode(carsLoadScanEntity.getLoadCode()); |
||||
trunklineCarsSignLogEntity.setLoadScanId(carsLoadScanEntity.getId()); |
||||
trunklineCarsSignLogEntity.setWarehouseId(carsLoadScanEntity.getWarehouseId()); |
||||
trunklineCarsSignLogEntity.setWarehouseName(carsLoadScanEntity.getWarehouseName()); |
||||
trunklineCarsSignLogEntity.setWaybillId(carsLoadScanEntity.getWaybillId()); |
||||
trunklineCarsSignLogEntity.setWaybillNo(carsLoadScanEntity.getWaybillNo()); |
||||
trunklineCarsSignLogEntity.setOrderCode(carsLoadScanEntity.getOrderCode()); |
||||
trunklineCarsSignLogEntity.setScanCode(carsLoadScanEntity.getScanCode()); |
||||
trunklineCarsSignLogEntity.setNum(carsLoadScanEntity.getUnloadNum()); |
||||
trunklineCarsSignLogEntity.setType(carsLoadScanEntity.getType()); |
||||
trunklineCarsSignLogEntity.setIsData(1); |
||||
trunklineCarsSignLogEntity.setIsAbnormal(0); |
||||
trunklineCarsSignLogEntity.setTrayId(carsLoadScanEntity.getTrayId()); |
||||
trunklineCarsSignLogEntity.setTrayCode(carsLoadScanEntity.getTrayName()); |
||||
trunklineCarsSignLogEntity.setTrayName(carsLoadScanEntity.getTrayName()); |
||||
trunklineCarsSignLogEntity.setFromWarehouseId(carsLoadScanEntity.getFromWarehouseId()); |
||||
trunklineCarsSignLogEntity.setRemark(remark); |
||||
save(trunklineCarsSignLogEntity); |
||||
} |
||||
} |
||||
@ -0,0 +1,51 @@
|
||||
package com.logpm.trunkline.service.impl; |
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
||||
import com.logpm.trunkline.dto.LoadCarsDTO; |
||||
import com.logpm.trunkline.entity.TrunklineLoadSignOrderEntity; |
||||
import com.logpm.trunkline.mapper.TrunklineLoadSignOrderMapper; |
||||
import com.logpm.trunkline.service.ITrunklineLoadSignOrderService; |
||||
import com.logpm.trunkline.vo.SignOrderDetailVO; |
||||
import com.logpm.trunkline.vo.TrunklineLoadSignOrderVO; |
||||
import lombok.AllArgsConstructor; |
||||
import lombok.extern.slf4j.Slf4j; |
||||
import org.springframework.stereotype.Service; |
||||
|
||||
import java.util.List; |
||||
|
||||
@Slf4j |
||||
@Service |
||||
@AllArgsConstructor |
||||
public class TrunklineLoadSignOrderServiceImpl extends ServiceImpl<TrunklineLoadSignOrderMapper, TrunklineLoadSignOrderEntity> implements ITrunklineLoadSignOrderService { |
||||
|
||||
@Override |
||||
public List<TrunklineLoadSignOrderEntity> findAllLoadSignOrderList(Long loadId, Long warehouseId) { |
||||
return baseMapper.findAllLoadSignOrderList(loadId,warehouseId); |
||||
} |
||||
|
||||
@Override |
||||
public void deleteListBySignStatusAndLoadIdAndWarehouseId(Long loadId, Long warehouseId) { |
||||
baseMapper.deleteListBySignStatusAndLoadIdAndWarehouseId(loadId,warehouseId); |
||||
} |
||||
|
||||
@Override |
||||
public IPage<TrunklineLoadSignOrderVO> finaSignOrderList(IPage<Object> page, LoadCarsDTO loadCarsDTO) { |
||||
return baseMapper.finaSignOrderList(page,loadCarsDTO); |
||||
} |
||||
|
||||
@Override |
||||
public TrunklineLoadSignOrderVO finaSignOrderDetail(Long signOrderId) { |
||||
return baseMapper.finaSignOrderDetail(signOrderId); |
||||
} |
||||
|
||||
@Override |
||||
public IPage<SignOrderDetailVO> findSignOrderDetailList(IPage<Object> page, LoadCarsDTO loadCarsDTO) { |
||||
return baseMapper.findSignOrderDetailList(page,loadCarsDTO); |
||||
} |
||||
|
||||
@Override |
||||
public void updateBelongToWarehouse(Long signOrderId, Long warehouseId, String warehouseName) { |
||||
baseMapper.updateBelongToWarehouse(signOrderId,warehouseId,warehouseName); |
||||
} |
||||
} |
||||
Loading…
Reference in new issue