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

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/api/DistributionAddvalueAppController.java

@@ -5,6 +5,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.logpm.distribution.dto.DistributionAddvaluePackageDTO;
 import com.logpm.distribution.dto.app.DistributionAppAddvalueDTO;
 import com.logpm.distribution.service.impl.DistributionAddvalueServiceImpl;
+import com.logpm.distribution.vo.DistributionAddvalueDetailVO;
 import com.logpm.distribution.vo.DistributionAddvaluePackageVO;
 import com.logpm.distribution.vo.app.*;
 import io.swagger.annotations.Api;
@@ -47,6 +48,19 @@ public class DistributionAddvalueAppController {
 
 
 
+	/**
+	 * 查询增值服务列表
+	 */
+	@GetMapping("/appList")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "查询增值服务列表", notes = "DistributionAppDeliveryListDTO")
+	public R appList(DistributionAppAddvalueDTO distributionAppAddvalueDTO) {
+		List<DistributionAddvalueDetailVO> appAddvalueVOIPage = distributionAddvalueService.appList(distributionAppAddvalueDTO);
+		return R.data(appAddvalueVOIPage);
+	}
+
+
+
 
 	/**
 	 * 扫描接口

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

@@ -881,6 +881,7 @@ FROM
         LEFT JOIN logpm_distribution_stockup AS ldss ON ldsi.stockup_id = ldss.id
         WHERE
         ldsi.reservation_id = lds.reservation_id
+        AND ldsi.stock_status != 4
         ) AS forkliftName,
         CASE
         WHEN ldr.stockup_status ='10' THEN '待指派'

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

@@ -25,6 +25,7 @@ import com.logpm.distribution.dto.app.DistributionAppAddvalueDTO;
 import com.logpm.distribution.entity.DistributionAddvalueEntity;
 import com.logpm.distribution.entity.DistributionAddvaluePackageEntity;
 import com.logpm.distribution.excel.DistributionAddvalueExcel;
+import com.logpm.distribution.vo.DistributionAddvalueDetailVO;
 import com.logpm.distribution.vo.DistributionAddvaluePackageVO;
 import com.logpm.distribution.vo.DistributionAddvalueVO;
 import com.logpm.distribution.vo.app.DistributionAppAddvalueVO;
@@ -128,6 +129,14 @@ public interface IDistributionAddvalueService extends IService<DistributionAddva
 	 */
 	R updatePCAddvalueInfo(DistributionAppAddvalueDTO distributionAppAddvalueDTO);
 
+	/**
+	 * 查询增值服务列表
+	 * @param distributionAppAddvalueDTO
+	 * @return
+	 */
+	List<DistributionAddvalueDetailVO> appList(DistributionAppAddvalueDTO distributionAppAddvalueDTO);
+
+
 
 //	/**
 //	 * 签收列表查看对应的增值服务列表信息

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

@@ -33,6 +33,7 @@ import com.logpm.distribution.entity.*;
 import com.logpm.distribution.excel.DistributionAddvalueExcel;
 import com.logpm.distribution.mapper.*;
 import com.logpm.distribution.service.*;
+import com.logpm.distribution.vo.DistributionAddvalueDetailVO;
 import com.logpm.distribution.vo.DistributionAddvaluePackageVO;
 import com.logpm.distribution.vo.DistributionAddvalueVO;
 import com.logpm.distribution.vo.app.DistributionAppAddvalueVO;
@@ -504,6 +505,15 @@ public class DistributionAddvalueServiceImpl extends BaseServiceImpl<Distributio
 		});
 		return packageDTOList;
 	}
+	private List<DistributionAddvaluePackageVO> handleAddvaluePackageEntityToVO(List<DistributionAddvaluePackageEntity> entityList) {
+		List<DistributionAddvaluePackageVO> packageVOList = new ArrayList<>();
+		entityList.forEach(r -> {
+			DistributionAddvaluePackageVO vo = Func.copy(r, DistributionAddvaluePackageVO.class);
+			packageVOList.add(vo);
+
+		});
+		return packageVOList;
+	}
 
 	private BigDecimal getUnitPrice(List<PriceDispatchAddClientVO> priceDispatchAddClientVOS, BasicdataFactoryCategoryEntity factoryCategoryEntity, DistributionAppAddvalueDTO distributionAppAddvalueDTO) {
 
@@ -1144,6 +1154,45 @@ public class DistributionAddvalueServiceImpl extends BaseServiceImpl<Distributio
 		return R.status(true);
 	}
 
+	@Override
+	public List<DistributionAddvalueDetailVO> appList(DistributionAppAddvalueDTO distributionAppAddvalueDTO) {
+		if (Func.isEmpty(distributionAppAddvalueDTO.getReservationId())){
+			log.error("增值服务列表参数缺失>>>>>>>>>>>ReservationId():{}",distributionAppAddvalueDTO.getReservationId());
+			return null;
+		}
+		//查询此客户下的所有增值服务列表
+		List<DistributionAddvalueEntity> list = this.list(Wrappers.<DistributionAddvalueEntity>query().lambda()
+			.eq(DistributionAddvalueEntity::getRefId, distributionAppAddvalueDTO.getReservationId())
+		);
+		if (list.isEmpty()){
+			//不存在增值服务
+			return null;
+		}
+		List<Long> addValueIds = list.stream().map(DistributionAddvalueEntity::getId).collect(Collectors.toList());
+		List<DistributionAddvalueDetailEntity> addValueDetailList = distributionAddvalueDetailService.list(Wrappers.<DistributionAddvalueDetailEntity>query().lambda()
+			.in(DistributionAddvalueDetailEntity::getAddvalueId, addValueIds)
+		);
+		if (addValueDetailList.isEmpty()){
+			//不存在增值服务
+			return null;
+		}
+		List<DistributionAddvalueDetailVO> addList = new ArrayList<>();
+		for (DistributionAddvalueDetailEntity distributionAddvalueDetailEntity : addValueDetailList) {
+			DistributionAddvalueDetailVO distributionAddvalueDetailVO = Func.copy(distributionAddvalueDetailEntity, DistributionAddvalueDetailVO.class);
+			List<DistributionAddvaluePackageEntity> addValuePackageList = distributionAddvaluePackageService.list(Wrappers.<DistributionAddvaluePackageEntity>query().lambda()
+				.eq(DistributionAddvaluePackageEntity::getAddvalueDetailId, distributionAddvalueDetailEntity.getId())
+				.eq(DistributionAddvaluePackageEntity::getReservationId, distributionAppAddvalueDTO.getReservationId())
+			);
+			if (!addValuePackageList.isEmpty()) {
+				List<DistributionAddvaluePackageVO> distributionAddvaluePackageVOS = handleAddvaluePackageEntityToVO(addValuePackageList);
+				distributionAddvalueDetailVO.setAddvaluePackageVOList(distributionAddvaluePackageVOS);
+				addList.add(distributionAddvalueDetailVO);
+			}
+		}
+
+		return addList;
+	}
+
 	private String verifyClient(List<Long> clientIds, List<DistributionAddvaluePackageDTO> packageEntityList) {
 		if (!clientIds.isEmpty()) {
 			//校验客户信息

blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.xml

@@ -275,10 +275,11 @@
         select singnfor_id singnforId,
         warehouse_id warehouseId
         from clear_singnfor_status_record
-        where deal_status = 0
+        where deal_status = 0 AND remarks is null
         <if test="id != null">
             and id > #{id}
         </if>
+        LIMIT 10
 
     </select>
     <select id="findAllBillSign" resultType="cn.hutool.json.JSONObject">

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/api/CarsLoadApiController.java

@@ -90,6 +90,7 @@ public class CarsLoadApiController {
 		Integer pageSize = loadCarsDTO.getPageSize();
 		String startDate = loadCarsDTO.getStartDate();
 		String endDate = loadCarsDTO.getEndDate();
+		String carsNo = loadCarsDTO.getCarsNo();
 		try{
 
 			//当前登录人选择的仓库

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

@@ -508,6 +508,9 @@
         and ltcl.load_type != '4'
         and ltcl.load_status != '100'
         and ltcl.start_warehouse_id = #{param.warehouseId}
+        <if test="param.carsNo != null and param.carsNo != '' ">
+            and Locate(#{param.carsNo},ltcl.cars_no) > 0
+        </if>
         <if test="param.startTime != null ">
             and ltcl.create_time &gt;= #{param.startTime}
         </if>
@@ -533,6 +536,9 @@
           and ltcll.sort != 1
           and ltcl.load_status != '0'
           and ltcl.load_type != '4'
+        <if test="param.carsNo != null and param.carsNo != '' ">
+            and Locate(#{param.carsNo},ltcl.cars_no) > 0
+        </if>
         <if test="param.startTime != null">
             and ltcl.start_time &gt;= #{param.startTime}
         </if>

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

@@ -237,14 +237,14 @@
     </select>
 
     <select id="findUnloadNumByLoadId" resultType="int">
-        select IFNULL(sum(num),0)
+        select IFNULL(sum(unload_num),0)
         from logpm_trunkline_cars_load_scan
         where load_id = #{loadId}
         and scan_status != '1'
     </select>
 
     <select id="findUnloadNumByLoadIdAndNodeId" resultType="int">
-        select IFNULL(sum(num),0)
+        select IFNULL(sum(unload_num),0)
         from logpm_trunkline_cars_load_scan
         where load_id = #{loadId}
           and unload_node_id = #{nodeId}
@@ -252,7 +252,7 @@
     </select>
 
     <select id="findUnloadNumByLoadIdAndNodeIdAndOrderCodeAndWaybillNo" resultType="int">
-        select IFNULL(sum(num),0)
+        select IFNULL(sum(unload_num),0)
         from logpm_trunkline_cars_load_scan
         where load_id = #{loadId}
           and warehouse_id = #{nodeId}