From fd30d7a3ed195332c0c10d1565e56c6343d46a44 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Thu, 22 Feb 2024 09:44:26 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=80=83=E6=A0=B8-=E6=8C=87=E6=A0=87?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=8C=89=E9=92=AE=E6=9D=83=E9=99=90=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=202.=E5=B9=B2=E7=BA=BF-bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/logpm/supervise/vo/ClassifyVO.java    |  1 +
 .../logpm/trunkline/dto/BillladingDTO.java    | 12 ++++
 .../vo/TrunklineBillladingWaybillVO.java      |  2 +
 .../service/impl/ClassifyServiceImpl.java     |  9 +++
 .../controller/BillladingController.java      |  2 +-
 .../mapper/TrunklineBillladingMapper.java     |  3 +-
 .../mapper/TrunklineBillladingMapper.xml      | 59 +++++++++++++++----
 .../TrunklineBillladingWaybillMapper.xml      |  4 +-
 .../impl/TrunklineBillladingServiceImpl.java  |  7 ++-
 .../impl/WarehouseTrayGoodsServiceImpl.java   |  3 +-
 10 files changed, 85 insertions(+), 17 deletions(-)

diff --git a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/ClassifyVO.java b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/ClassifyVO.java
index 1fe20325e..4fe374ae1 100644
--- a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/ClassifyVO.java
+++ b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/ClassifyVO.java
@@ -42,5 +42,6 @@ public class ClassifyVO extends ClassifyEntity {
 
 	private List<PointsVO> pointsVOS ;
 
+	private Integer isEdit;
 
 }
diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/BillladingDTO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/BillladingDTO.java
index 656e2b06b..a48af901c 100644
--- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/BillladingDTO.java
+++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/BillladingDTO.java
@@ -6,6 +6,7 @@ import com.logpm.trunkline.vo.TrunklineBillladingWaybillVO;
 import lombok.Data;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 @Data
@@ -41,4 +42,15 @@ public class BillladingDTO extends TrunklineBillladingEntity {
 	private String startDateStr;
 	private String endDateStr;
 
+	private Date startDate;
+	private Date endDate;
+
+	private String goodsName;//货物名称
+	private String customerTrain;//车次号
+	private String shipper;//发货单位
+	private String shipperName;//发货人
+	private String consignee;//收货单位
+	private String remark;//备注
+	private String destinationWarehouseName;//目的仓
+
 }
diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineBillladingWaybillVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineBillladingWaybillVO.java
index ccb963eac..eaf83f091 100644
--- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineBillladingWaybillVO.java
+++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineBillladingWaybillVO.java
@@ -18,8 +18,10 @@ public class TrunklineBillladingWaybillVO extends TrunklineBillladingWaybillEnti
 
 	private String destination;//到站
 	private String destinationWarehouseName;//目的仓
+	private String shipper;//发货单位
 	private String shipperName;//发货人
 	private String shipperMobile;//发货人电话
+	private String consignee;//收货单位
 	private String consigneeName;//收货人
 	private String consigneeMobile;//收货人电话
 	private String consigneeAddress;//收货人地址
diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java
index ebf78a429..8bd897378 100644
--- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java
+++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java
@@ -118,12 +118,21 @@ public class ClassifyServiceImpl extends BaseServiceImpl<ClassifyMapper, Classif
 		IPage<ClassifyVO> pages = baseMapper.pageList(page, classifyDTO);
 		List<ClassifyVO> records = pages.getRecords();
 
+		String loginDeptId = AuthUtil.getDeptId();
 
 		for (ClassifyVO record : records) {
 			Long deptId = record.getCreateDept();
 			String deptName = deptClient.findNameById(deptId);
 			record.setCreateDeptName(deptName);
 			if (!"1".equals(isPid)) {
+				String ancestors = deptClient.getAncestorsByDeptId(deptId);
+				boolean contains = ancestors.contains(loginDeptId);
+				if(contains){
+					record.setIsEdit(1);
+				}else{
+					record.setIsEdit(0);
+				}
+
 				Long classifyId = record.getId();
 				Long pId1 = record.getPId();
 				ClassifyEntity classifyEntity = getById(pId1);
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/BillladingController.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/BillladingController.java
index 818666152..2f990ec59 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/BillladingController.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/BillladingController.java
@@ -49,7 +49,7 @@ public class BillladingController {
 
 			//当前登录人选择的仓库
 			BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
-			if(!Objects.isNull(myCurrentWarehouse)){
+			if(Objects.isNull(myCurrentWarehouse)){
 				log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse);
 				return R.fail(403,"仓库信息为空");
 			}
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingMapper.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingMapper.java
index 8454098cc..8e182e739 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingMapper.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingMapper.java
@@ -12,7 +12,6 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
-import java.util.List;
 import java.util.Map;
 
 @Mapper
@@ -22,7 +21,7 @@ public interface TrunklineBillladingMapper extends BaseMapper<TrunklineBillladin
 
 	IPage<TrunklineBillladingVO> pageInfoList(IPage<Object> page, @Param("param") BillladingDTO billladingDTO);
 
-	IPage<WarehouseWaybillVO> findWaybillListNotBillladingId(IPage<Object> page,@Param("list") List<String> waybillNos);
+	IPage<WarehouseWaybillVO> findWaybillListNotBillladingId(IPage<Object> page,@Param("param") BillladingDTO billladingDTO);
 
     IPage<TrunklineBillladingDetailVO> billladingList(IPage<Object> page, @Param("warehouseId") Long warehouseId, @Param("startByDateStr") Date startByDateStr, @Param("endByDateStr") Date endByDateStr);
 
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingMapper.xml
index 69134681b..12de149e3 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingMapper.xml
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingMapper.xml
@@ -86,22 +86,61 @@
     <select id="findWaybillListNotBillladingId" resultType="com.logpm.warehouse.vo.WarehouseWaybillVO">
 
         select lww.waybill_no waybillNo,
-               lww.create_time createTime,
-               lww.goods_name goodsName,
-               lww.destination destination,
-               lww.shipper_name shipperName,
-               lww.shipper_mobile shipperMobile,
-               lww.consignee_name consigneeName,
-               lww.consignee_mobile consigneeMobile,
-               lww.remark remark
+        lww.create_time createTime,
+        lww.goods_name goodsName,
+        lww.destination destination,
+        lww.customer_train customerTrain,
+        lww.shipper shipper,
+        lww.total_count totalCount,
+        lww.total_weight totalWeight,
+        lww.total_volume totalVolume,
+        lww.total_freight totalFreight,
+        lww.shipper_name shipperName,
+        lww.shipper_mobile shipperMobile,
+        lww.consignee consignee,
+        lww.consignee_name consigneeName,
+        lww.consignee_mobile consigneeMobile,
+        lww.destination_warehouse_name destinationWarehouseName,
+        lww.remark remark
         from logpm_warehouse_waybill lww
         where lww.stock_count != total_count
-        <if test="list != null and @org.apache.commons.collections4.CollectionUtils@isNotEmpty(list)">
+        and lww.departure_warehouse_id = #{param.warehouseId}
+        <if test="param.waybillNos != null and @org.apache.commons.collections4.CollectionUtils@isNotEmpty(param.waybillNos)">
               and lww.waybill_no not in
-            <foreach collection="list" item="item" open="(" separator="," close=")">
+            <foreach collection="param.waybillNos" item="item" open="(" separator="," close=")">
                 #{item}
             </foreach>
         </if>
+        <if test="param.waybillNo != null and param.waybillNo != ''">
+            and lww.waybill_no like concat(#{param.waybillNo},'%')
+        </if>
+        <if test="param.shipper != null and param.shipper != ''">
+            and lww.shipper like concat(#{param.shipper},'%')
+        </if>
+        <if test="param.consignee != null and param.consignee != ''">
+            and lww.consignee like concat(#{param.consignee},'%')
+        </if>
+        <if test="param.shipperName != null and param.shipperName != ''">
+            and lww.shipper_name like concat(#{param.shipperName},'%')
+        </if>
+        <if test="param.customerTrain != null and param.customerTrain != ''">
+            and lww.customer_train like concat(#{param.customerTrain},'%')
+        </if>
+        <if test="param.goodsName != null and param.goodsName != ''">
+            and lww.goods_name like concat(#{param.goodsName},'%')
+        </if>
+        <if test="param.remark != null and param.remark != ''">
+            and lww.remark like concat(#{param.remark},'%')
+        </if>
+        <if test="param.startDate != null ">
+            and lww.create_time &gt;= #{param.startDate}
+        </if>
+        <if test="param.endDate != null ">
+            and lww.create_time &lt;= #{param.endDate}
+        </if>
+        <if test="param.destinationWarehouseName != null and param.destinationWarehouseName != '' ">
+            and lww.destination_warehouse_name like concat(#{param.destinationWarehouseName},'%')
+        </if>
 
     </select>
 
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingWaybillMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingWaybillMapper.xml
index 03f2a0be8..5e86ecf33 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingWaybillMapper.xml
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingWaybillMapper.xml
@@ -31,8 +31,10 @@
                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,
@@ -41,7 +43,7 @@
                lww.collect_pay collectPay
         from logpm_trunkline_billlading_waybill ltbw
                  left join logpm_trunkline_billlading ltb on ltb.id = ltbw.billlading_id
-                 left join logpm_warehouse_waybill lww on lww.id = ltbw.waybill_id
+                 left join logpm_warehouse_waybill lww on lww.waybill_no = ltbw.waybill_no
         where ltbw.billlading_id = #{billladingId}
     </select>
 
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingServiceImpl.java
index 79320c445..8489778cf 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingServiceImpl.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingServiceImpl.java
@@ -99,6 +99,7 @@ public class TrunklineBillladingServiceImpl extends BaseServiceImpl<TrunklineBil
 			billladingLineEntity.setWarehouseName(warehouseName);
 			billladingLineService.save(billladingLineEntity);
 		}
+		lineTitle = lineTitle + "-->" + warehouseName;
 		trunklineBillladingEntity.setLineNameTitle(lineTitle);
 		updateById(trunklineBillladingEntity);
 
@@ -442,8 +443,10 @@ public class TrunklineBillladingServiceImpl extends BaseServiceImpl<TrunklineBil
 		page.setCurrent(billladingDTO.getPageNum());
 		page.setSize(billladingDTO.getPageSize());
 
-		List<String> waybillNos = billladingDTO.getWaybillNos();
-		IPage<WarehouseWaybillVO> ls =  baseMapper.findWaybillListNotBillladingId(page,waybillNos);
+		billladingDTO.setStartDate(CommonUtil.getStartByDateStr(billladingDTO.getStartDateStr()));
+		billladingDTO.setEndDate(CommonUtil.getEndByDateStr(billladingDTO.getEndDateStr()));
+
+		IPage<WarehouseWaybillVO> ls =  baseMapper.findWaybillListNotBillladingId(page,billladingDTO);
 
 		return R.data(ls);
 	}
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayGoodsServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayGoodsServiceImpl.java
index b21e36c7c..542460ec6 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayGoodsServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayGoodsServiceImpl.java
@@ -43,7 +43,8 @@ public class WarehouseTrayGoodsServiceImpl extends BaseServiceImpl<WarehouseTray
 	}
 
 	@Override
-	public void saveEntityPackage(DistributionParcelListEntity parcelListEntity, WarehouseTrayTypeEntity trayTypeEntity, String isException,String bindingType,String remark,String palletizingType) {
+	public void
+	saveEntityPackage(DistributionParcelListEntity parcelListEntity, WarehouseTrayTypeEntity trayTypeEntity, String isException,String bindingType,String remark,String palletizingType) {
 		Date date = new Date();
 		WarehouseTrayGoodsEntity trayGoodsEntity = new WarehouseTrayGoodsEntity();
 		trayGoodsEntity.setCreateUser(1714696768639311873L);