Merge branch 'dev' into pre-production

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataFreightDetailEntity.java

@@ -0,0 +1,102 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.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;
+
+import java.math.BigDecimal;
+
+/**
+ * 基础客户品牌类型明细表 实体类
+ * @author zhaoqiaobo
+ * @since 2024-03-04
+ */
+@Data
+@TableName("logpm_basicdata_freight_detail")
+@ApiModel(value = "BasicdataFreight明细对象", description = "基础客户品牌类型明细表")
+@EqualsAndHashCode(callSuper = true)
+public class BasicdataFreightDetailEntity extends TenantEntity {
+
+	/**
+	 * 预留1
+	 */
+	@ApiModelProperty(value = "预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ApiModelProperty(value = "预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ApiModelProperty(value = "预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ApiModelProperty(value = "预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ApiModelProperty(value = "预留5")
+	private String reserve5;
+	/**
+	 * 计算方式;1件  2方  3公斤
+	 */
+	@ApiModelProperty(value = "计算方式;1件  2方  3公斤")
+	private Long formulaMode;
+	@ApiModelProperty(value = "计算方式;1件  2方  3公斤")
+	private String formulaModeName;
+
+	/**
+	 * 费用名称
+	 */
+	@ApiModelProperty(value = "费用名称id")
+	private String itemId;
+
+	@ApiModelProperty(value = "费用名称")
+	private String itemName;
+
+	/**
+	 * 费用
+	 */
+	@ApiModelProperty(value = "费用")
+	private BigDecimal cost;
+	/**
+	 * 类型id
+	 */
+	@ApiModelProperty(value = "类型：干,仓，配")
+	private String typeId;
+	/**
+	 * 类型名称
+	 */
+	@ApiModelProperty(value = "类型：干,仓，配")
+	private String typeName;
+	/**
+	 * 类型
+	 */
+	@ApiModelProperty(value = "基础客户品牌类型id")
+	private Long freightId;
+
+}

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataFreightEntity.java

@@ -63,11 +63,7 @@ public class BasicdataFreightEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "预留5")
 	private String reserve5;
-	/**
+
-	 * 计算方式;1件  2方  3公斤
-	 */
-	@ApiModelProperty(value = "计算方式;1件  2方  3公斤")
-	private Integer formulaMode;
 	/**
 	 * 物品名称
 	 */
@@ -102,7 +98,7 @@ public class BasicdataFreightEntity extends TenantEntity {
 	 * 一口价
 	 */
 	@ApiModelProperty(value = "一口价")
-	private BigDecimal fixedPrice;
+	private Byte fixedPrice;
 	/**
 	 * 生效时间
 	 */
@@ -122,6 +118,6 @@ public class BasicdataFreightEntity extends TenantEntity {
 	 * 标识;1 干仓配 2 一口价 3 每趟 4户
 	 */
 	@ApiModelProperty(value = "标识;1 干仓配 2 一口价 3 每趟 4户")
-	private Byte identification;
+	private Integer identification;
 
 }

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataFreightClient.java

@@ -16,13 +16,17 @@
  */
 package com.logpm.basicdata.feign;
 
+import com.logpm.basicdata.entity.BasicdataFreightDetailEntity;
 import com.logpm.basicdata.entity.BasicdataFreightEntity;
+import com.logpm.basicdata.vo.BasicdataFreightApiVO;
 import org.springblade.common.constant.ModuleNameConstant;
 import org.springblade.core.mp.support.BladePage;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.List;
+
 /**
  * 基础客户品牌类型表 Feign接口类
  *
@@ -36,6 +40,7 @@ public interface IBasicdataFreightClient {
 
     String API_PREFIX = "/client";
     String TOP = API_PREFIX + "/top123";
+    String PRICE = API_PREFIX + "/pirce";
 
     /**
      * 获取基础客户品牌类型表列表
@@ -47,4 +52,9 @@ public interface IBasicdataFreightClient {
     @GetMapping(TOP)
     BladePage<BasicdataFreightEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
 
+   @GetMapping(PRICE)
+    List<BasicdataFreightDetailEntity> pirce(BasicdataFreightApiVO param);
+
+
+
 }

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataFreightApiVO.java

@@ -0,0 +1,37 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 基础客户品牌类型表 视图实体类
+ *
+ * @author cyz
+ * @since 2023-06-08
+ */
+@Data
+public class BasicdataFreightApiVO implements Serializable {
+	private static final long serialVersionUID = 1L;
+	private String itemName;
+	private String category;
+	private String issueWarehouse;
+	private String destination;
+	private String arrivalWarehouse;
+}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml

@@ -794,15 +794,12 @@
                             #{item}
                         </foreach>
                     </if>
-
                     <if test="warehouseIdList != null and @org.apache.commons.collections4.CollectionUtils@isNotEmpty(warehouseIdList)">
                         and lddl.warehouse_id in
                         <foreach collection="warehouseIdList" item="item" open="(" close=")" separator=",">
                             #{item}
                         </foreach>
                     </if>
-
-
                     <if test="param.createTime_query!=null and param.createTime_query!=''">
                         and date_format(lddl.create_time,'%y%m%d%') = date_format(#{param.createTime_query},'%y%m%d%')
                     </if>

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

@@ -2920,6 +2920,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			 */
 			List<Long> warehouseIdList = getWarehouseIdList();
 
+			log.info(">>> 仓库ID {}",warehouseIdList);
+
 			distributionAppDeliveryListVOS = baseMapper.selectDistributionAppDeliveryInListPage(page, distributionAppDeliveryListDTO, null,warehouseIdList);
 		}
 

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

@@ -34,6 +34,7 @@ import org.springframework.stereotype.Service;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 @Slf4j
 @Service
@@ -139,6 +140,7 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl<Trunkline
 		for (String orderPackageCode : idArray) {
 			DistributionStockArticleQRCodeVO vo  = new DistributionStockArticleQRCodeVO();
 			TrunklineAdvanceDetailEntity advanceDetailEntity = baseMapper.findEntityByOrderPackageCodelimit1(orderPackageCode);
+			if(!Objects.isNull(advanceDetailEntity)){
 				Long advanceId = advanceDetailEntity.getAdvanceId();
 				TrunklineAdvanceEntity advanceEntity = advanceMapper.selectById(advanceId);
 				if(ObjectUtil.isEmpty(advanceEntity.getSenderName()) || ("/").equals(advanceEntity.getSenderName())){
@@ -159,9 +161,12 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl<Trunkline
 				vo.setQrCode(orderPackageCode);
 				vo.setDealerName(advanceEntity.getDealerName());
 				vo.setTotalNumber(advanceEntity.getTotalNum()+"");
+			}
 
 			Map<String, Object> map = JSONObject.parseObject(JSONObject.toJSONString(vo), Map.class);
+			if(!Objects.isNull(advanceDetailEntity)){
 				map.put("id",advanceDetailEntity.getId());
+			}
 			String filename = QRCodeUtil.createCodeToFile(vo.getQrCode());
 			map.put("img", QRCodeUtil.getEmpAutograph(filename));
 			// 订单号 生成二维码