1.货位详情

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java

@@ -200,13 +200,10 @@ public class BasicdataDriverArteryController extends BladeController {
 	@GetMapping("/export-basicdataDriverArtery")
 	@ApiOperationSupport(order = 9)
 	@ApiOperation(value = "导出数据", notes = "传入basicdataDriverArtery")
-	public void exportBasicdataDriverArtery(@ApiIgnore @RequestParam Map<String, Object> basicdataDriverArtery, BladeUser bladeUser, HttpServletResponse response) {
-		QueryWrapper<BasicdataDriverArteryEntity> queryWrapper = Condition.getQueryWrapper(basicdataDriverArtery, BasicdataDriverArteryEntity.class);
-		//if (!AuthUtil.isAdministrator()) {
-		//	queryWrapper.lambda().eq(BasicdataDriverArtery::getTenantId, bladeUser.getTenantId());
-		//}
-		queryWrapper.lambda().eq(BasicdataDriverArteryEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
-		List<BasicdataDriverArteryExcel> list = basicdataDriverArteryService.exportBasicdataDriverArtery(queryWrapper);
+	public void exportBasicdataDriverArtery(BasicdataDriverArteryDTO basicdataDriverArtery, HttpServletResponse response) {
+//		QueryWrapper<BasicdataDriverArteryEntity> queryWrapper = Condition.getQueryWrapper(basicdataDriverArtery, BasicdataDriverArteryEntity.class);
+//		queryWrapper.lambda().eq(BasicdataDriverArteryEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+		List<BasicdataDriverArteryExcel> list = basicdataDriverArteryService.exportBasicdataDriverArtery(basicdataDriverArtery);
 		ExcelUtil.export(response, "司机信息表数据" + DateUtil.time(), "司机信息表数据表", list, BasicdataDriverArteryExcel.class);
 	}
 

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataDriverArteryExcel.java

@@ -21,6 +21,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -41,209 +42,144 @@ public class BasicdataDriverArteryExcel implements Serializable {
 
 	private static final long serialVersionUID = 1L;
 
-	/**
-	 * 租户号
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("租户号")
-	private String tenantId;
-	/**
-	 * 是否已删除;1-未删除，2-已删除
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("是否已删除;1-未删除，2-已删除")
-	private Integer isDeleted;
+
+
 	/**
 	 * 司机姓名
 	 */
-	@ColumnWidth(20)
+	@ColumnWidth(40)
 	@ExcelProperty("司机姓名")
 	private String name;
 	/**
 	 * 司机手机号码
 	 */
-	@ColumnWidth(20)
+	@ColumnWidth(40)
 	@ExcelProperty("司机手机号码")
 	private String phone;
+
+	/**
+	 * 车辆信息
+	 */
+	@ColumnWidth(40)
+	@ExcelProperty("车辆信息")
+	private String  bindVehicles;
 	/**
 	 * 司机类型;1-自有,2-加盟,3-外调,4-临调
 	 */
-	@ColumnWidth(20)
+	@ColumnWidth(40)
 	@ExcelProperty("司机类型;1-自有,2-加盟,3-外调,4-临调")
 	private Integer type;
 	/**
 	 * 职务类型;1-干线,2-配送
 	 */
-	@ColumnWidth(20)
+	@ColumnWidth(40)
 	@ExcelProperty("职务类型;1-干线,2-配送")
 	private Integer jobType;
 	/**
 	 * 准驾车型;1-A1,2-A2,3-A3,4-B1,5-B2,6-C1,7-C2
 	 */
-	@ColumnWidth(20)
+	@ColumnWidth(40)
 	@ExcelProperty("准驾车型;1-A1,2-A2,3-A3,4-B1,5-B2,6-C1,7-C2")
 	private Integer drivingType;
-	/**
-	 * 备注
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("备注")
-	private String notes;
+
 	/**
 	 * 绑定车辆
 	 */
-	@ColumnWidth(20)
+	@ColumnWidth(40)
 	@ExcelProperty("绑定车辆")
 	private String bindVehicle;
 	/**
 	 * 合同开始时间
 	 */
-	@ColumnWidth(20)
+	@ColumnWidth(40)
 	@ExcelProperty("合同开始时间")
-	private Date contractStartTime;
+	private String contractStartTime;
 	/**
 	 * 合同结束时间
 	 */
-	@ColumnWidth(20)
+	@ColumnWidth(40)
 	@ExcelProperty("合同结束时间")
-	private Date contractEndTime;
+	private String contractEndTime;
 	/**
 	 * 身份证号
 	 */
-	@ColumnWidth(20)
+	@ColumnWidth(40)
 	@ExcelProperty("身份证号")
 	private String idCard;
 	/**
 	 * 性别
 	 */
-	@ColumnWidth(20)
+	@ColumnWidth(40)
 	@ExcelProperty("性别")
 	private Integer gender;
 	/**
 	 * 居住地址
 	 */
-	@ColumnWidth(20)
+	@ColumnWidth(40)
 	@ExcelProperty("居住地址")
 	private String residentialAddress;
 	/**
 	 * 银行类型;1-工商银行,2-建设银行,3-农业银行,4-邮政银行,5-中国银行,6-交通银行,7-其他
 	 */
-	@ColumnWidth(20)
+	@ColumnWidth(40)
 	@ExcelProperty("银行类型;1-工商银行,2-建设银行,3-农业银行,4-邮政银行,5-中国银行,6-交通银行,7-其他")
 	private Integer bankType;
 	/**
 	 * 银行卡号
 	 */
-	@ColumnWidth(20)
+	@ColumnWidth(40)
 	@ExcelProperty("银行卡号")
 	private String bankCardNub;
 	/**
 	 * 驾驶证号
 	 */
-	@ColumnWidth(20)
+	@ColumnWidth(40)
 	@ExcelProperty("驾驶证号")
 	private String driverLicenseNub;
 	/**
 	 * 驾驶证发证机关
 	 */
-	@ColumnWidth(20)
+	@ColumnWidth(40)
 	@ExcelProperty("驾驶证发证机关")
 	private String driverLicenseOrgan;
 	/**
 	 * 驾驶证起始日期
 	 */
-	@ColumnWidth(20)
+	@ColumnWidth(40)
 	@ExcelProperty("驾驶证起始日期")
-	private Date driverLicenseStartTime;
+	private String driverLicenseStartTime;
 	/**
 	 * 驾驶证到期日期
 	 */
-	@ColumnWidth(20)
+	@ColumnWidth(40)
 	@ExcelProperty("驾驶证到期日期")
-	private Date driverLicenseEndTime;
+	private String driverLicenseEndTime;
 	/**
 	 * 从业资格证编号
 	 */
-	@ColumnWidth(20)
+	@ColumnWidth(40)
 	@ExcelProperty("从业资格证编号")
 	private String employeeQualificationNub;
 	/**
 	 * 道路经营许可证号
 	 */
-	@ColumnWidth(20)
+	@ColumnWidth(40)
 	@ExcelProperty("道路经营许可证号")
 	private String roadOperationLicenseNub;
-	/**
-	 * 身份证正面照片
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("身份证正面照片")
-	private String idCardFrontPhoto;
-	/**
-	 * 身份证背面照片
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("身份证背面照片")
-	private String idCardBackPhoto;
-	/**
-	 * 驾驶证照片
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("驾驶证照片")
-	private String driverLicensePhoto;
-	/**
-	 * 驾驶证背面照片
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("驾驶证背面照片")
-	private String driverLicensePhotoBack;
-	/**
-	 * 人证合照照片
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("人证合照照片")
-	private String licensePeoplePhoto;
-	/**
-	 * 关联承运商Id
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("关联承运商Id")
-	private String carrierId;
+
 	/**
 	 * 运输协议
 	 */
-	@ColumnWidth(20)
+	@ColumnWidth(40)
 	@ExcelProperty("运输协议")
 	private String transportationAgreement;
+
 	/**
-	 * 预留1
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预留1")
-	private String reserve1;
-	/**
-	 * 预留2
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预留2")
-	private String reserve2;
-	/**
-	 * 预留3
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预留3")
-	private String reserve3;
-	/**
-	 * 预留4
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预留4")
-	private String reserve4;
-	/**
-	 * 预留5
+	 * 备注
 	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预留5")
-	private String reserve5;
+	@ColumnWidth(40)
+	@ExcelProperty("备注")
+	private String notes;
+
 
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataDriverArteryMapper.java

@@ -47,10 +47,10 @@ public interface BasicdataDriverArteryMapper extends BaseMapper<BasicdataDriverA
 
 	/**
 	 * 获取导出数据
-	 * @param queryWrapper
+	 * @param basicdataDriverArtery
 	 * @return
 	 */
-	List<BasicdataDriverArteryExcel> exportBasicdataDriverArtery(@Param("ew") Wrapper<BasicdataDriverArteryEntity> queryWrapper);
+	List<BasicdataDriverArteryExcel> exportBasicdataDriverArtery(@Param("param") BasicdataDriverArteryDTO basicdataDriverArtery);
 	/**
 	 * 查询司机字典
 	 *

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataDriverArteryMapper.xml

@@ -51,13 +51,9 @@
     <select id="selectBasicdataDriverArteryPage" resultType="com.logpm.basicdata.vo.BasicdataDriverArteryVO">
         SELECT
         lbda.id id,
-        lbda.tenant_id tenantId,
         lbda.create_user createUser,
         lbda.create_time createTime,
-        lbda.update_user updateUser,
         lbda.update_time updateTime,
-        lbda.STATUS STATUS,
-        lbda.create_dept createDept,
         lbda.NAME NAME,
         lbda.phone phone,
         lbda.type type,
@@ -107,7 +103,44 @@
 
 
     <select id="exportBasicdataDriverArtery" resultType="com.logpm.basicdata.excel.BasicdataDriverArteryExcel">
-        SELECT * FROM logpm_basicdata_driver_artery ${ew.customSqlSegment}
+        SELECT
+        lbda.NAME NAME,
+        lbda.phone phone,
+        lbda.type type,
+        lbda.job_type jobType,
+        lbda.driving_type drivingType,
+        lbda.notes notes,
+        lbda.bind_vehicle bindVehicle,
+        lbda.contract_start_time contractStartTime,
+        lbda.contract_end_time contractEndTime,
+        lbda.id_card idCard,
+        lbda.gender gender,
+        lbda.residential_address residentialAddress,
+        lbda.bank_type bankType,
+        lbda.bank_card_nub bankCardNub,
+        lbda.driver_license_nub driverLicenseNub,
+        lbda.driver_license_organ driverLicenseOrgan,
+        lbda.driver_license_start_time driverLicenseStartTime,
+        lbda.driver_license_end_time driverLicenseEndTime,
+        lbda.employee_qualification_nub employeeQualificationNub,
+        lbda.transportation_agreement transportationAgreement,
+        (SELECT GROUP_CONCAT(brand_id SEPARATOR ',') from logpm_basicdata_drivermiddle lbd WHERE lbd.driver_id = lbda.id and lbd.is_deleted = 0) bindVehicles
+        FROM
+        logpm_basicdata_driver_artery lbda
+        <where>
+            lbda.is_deleted = 0
+            <if test="param.name != null ">and lbda.name like
+                concat('%',#{param.name},'%')
+            </if>
+            <if test="param.phone != null ">and lbda.phone like
+                concat('%',#{param.phone},'%')
+            </if>
+            <if test="param.type != null ">and lbda.type like
+                concat('%',#{param.type},'%')
+            </if>
+            <if test="param.jobType != null ">and lbda.job_type like concat('%',#{param.jobType},'%')</if>
+            <if test="param.carrierId != null ">and lbda.carrier_id = #{param.carrierId}</if>
+        </where>
     </select>
     <select id="selectBasicdataDictionary" resultType="com.logpm.basicdata.vo.BasicdataDriverArteryVO">
         SELECT id,name,bind_vehicle FROM logpm_basicdata_driver_artery

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataDriverArteryService.java

@@ -46,10 +46,10 @@ public interface IBasicdataDriverArteryService extends BaseService<BasicdataDriv
 	/**
 	 * 导出数据
 	 *
-	 * @param queryWrapper
+	 * @param basicdataDriverArteryDTO
 	 * @return
 	 */
-	List<BasicdataDriverArteryExcel> exportBasicdataDriverArtery(Wrapper<BasicdataDriverArteryEntity> queryWrapper);
+	List<BasicdataDriverArteryExcel> exportBasicdataDriverArtery(BasicdataDriverArteryDTO basicdataDriverArteryDTO);
 	/**
 	 * 修改
 	 *

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataGoodsAllocationService.java

@@ -24,6 +24,9 @@ import com.logpm.basicdata.excel.BasicdataGoodsAllocationExcel;
 import com.logpm.basicdata.vo.BasicdataGoodsAllocationVO;
 import com.logpm.basicdata.vo.BasicdataNodeVO;
 import com.logpm.basicdata.vo.FreightSpaceVO;
+import com.logpm.warehouse.vo.WarehouseStockArticleZationVO;
+import com.logpm.warehouse.vo.WarehouseStockListZationVO;
+import com.logpm.warehouse.vo.WarehouseVisualizationVO;
 import org.springblade.core.mp.base.BaseService;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataDriverArteryServiceImpl.java

@@ -76,8 +76,8 @@ public class BasicdataDriverArteryServiceImpl extends BaseServiceImpl<BasicdataD
 
 
 	@Override
-	public List<BasicdataDriverArteryExcel> exportBasicdataDriverArtery(Wrapper<BasicdataDriverArteryEntity> queryWrapper) {
-		List<BasicdataDriverArteryExcel> basicdataDriverArteryList = baseMapper.exportBasicdataDriverArtery(queryWrapper);
+	public List<BasicdataDriverArteryExcel> exportBasicdataDriverArtery(BasicdataDriverArteryDTO basicdataDriverArteryDTO) {
+		List<BasicdataDriverArteryExcel> basicdataDriverArteryList = baseMapper.exportBasicdataDriverArtery(basicdataDriverArteryDTO);
 		//basicdataDriverArteryList.forEach(basicdataDriverArtery -> {
 		//	basicdataDriverArtery.setTypeName(DictCache.getValue(DictEnum.YES_NO, BasicdataDriverArtery.getType()));
 		//});

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAllocationServiceImpl.java

@@ -35,6 +35,9 @@ import com.logpm.basicdata.service.IBasicdataGoodsAllocationService;
 import com.logpm.basicdata.service.IBasicdataWarehouseService;
 import com.logpm.basicdata.vo.*;
 import com.logpm.warehouse.feign.IWarehouseUpdownGoodsClient;
+import com.logpm.warehouse.vo.WarehouseStockArticleZationVO;
+import com.logpm.warehouse.vo.WarehouseStockListZationVO;
+import com.logpm.warehouse.vo.WarehouseVisualizationVO;
 import lombok.AllArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.springblade.common.constant.printTemplate.PrintTemplateStatusConstant;

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionInQueryApiController.java

@@ -6,9 +6,11 @@ import com.logpm.distribution.service.IDistributionStockArticleService;
 import com.logpm.distribution.vo.app.queryOrderVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -47,4 +49,14 @@ public class DistributionInQueryApiController {
 		return R.data(q);
 	}
 
+	/**
+	 * 模板数据
+	 */
+	@PostMapping("/template")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "模板数据", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.data(distributionStockArticleService.selectTemplate(Func.toLongList(ids)));
+	}
+
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockArticleService.java

@@ -185,4 +185,5 @@ public interface IDistributionStockArticleService extends BaseService<Distributi
 
 	IPage<DistributionParcelListVO> getPackageListByStockArticleId(IPage<DistributionParcelListVO> page, Long orderId);
 
+	Object selectTemplate(List<Long> ids);
 }

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

@@ -1114,6 +1114,11 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 		return page.setRecords(parcelListVOS);
 	}
 
+	@Override
+	public Object selectTemplate(List<Long> ids) {
+		return null;
+	}
+
 
 	@Override
 	public DistributionStockArticleEntity findZeroByOrderCodeAndWarehouseId(String orderCode, Long warehouseId) {

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

@@ -196,6 +196,7 @@
         ldsl.cargo_norms cargoNorms,
         ldsl.cargo_unit cargoUnit,
         ldsl.market_id marketId,
+        ldsl.market_name marketName,
          ldsl.incoming_batch incomingBatch,
         lbm.product_code materialCode,
         ldsl.sku sku,

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/wrapper/WarehouseVisualizaVOWrapper.java

@@ -20,9 +20,7 @@ import com.logpm.warehouse.vo.WarehouseScanRecordVO;
 import com.logpm.warehouse.vo.WarehouseVisualizationVO;
 import org.springblade.common.constant.DictBizConstant;
 import org.springblade.core.mp.support.BaseEntityWrapper;
-import org.springblade.core.tool.utils.SpringUtil;
 import org.springblade.system.cache.DictBizCache;
-import org.springblade.system.feign.IUserClient;
 
 /**
  * 备货扫描记录 包装类,返回视图层所需的字段