Merge branch 'pre-production'

blade-service-api/logpm-report-api/src/main/java/com/logpm/report/entity/LargeScreenDataEntity.java

@@ -13,7 +13,6 @@ import java.util.Map;
 @Data
 @TableName("logpm_large_screen_data")
 @EqualsAndHashCode(callSuper = true)
-@AllArgsConstructor
 public class LargeScreenDataEntity extends TenantEntity {
 
 	/** 预留1 */
@@ -33,9 +32,6 @@ public class LargeScreenDataEntity extends TenantEntity {
 	private String reserve5 ;
 
 	@ApiModelProperty(name = "数据",notes = "")
-	private Map<String, Object> data;
+	private String data;
 
-	public LargeScreenDataEntity(Map<String, Object> data) {
-		this.data = data;
-	}
 }

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/ExportWarehouseWaybillVO.java

@@ -125,6 +125,9 @@ public class ExportWarehouseWaybillVO implements Serializable {
 	@ExcelProperty(value = "仓储操作费")
 	private BigDecimal handlingFee;
 
+	@ExcelProperty(value = "安装费")
+	private BigDecimal installFee;
+
 	@ExcelProperty(value = "申明价值")
 	private BigDecimal claimingValue;
 

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalRecordServiceImpl.java

@@ -503,6 +503,7 @@ public class AftersalesAbnormalRecordServiceImpl extends BaseServiceImpl<Aftersa
 								carsLoadScanEntity.setUnloadNodeName(warehouseEntity.getName());
 								carsLoadScanEntity.setUnloadUserName(AuthUtil.getNickName());
 								carsLoadScanEntity.setUnloadTime(new Date());
+								carsLoadScanEntity.setUnloadCheck(1);
 								trunklineCarsLoadScanClient.updateEntity(carsLoadScanEntity);
 
 								String waybillNo = carsLoadScanEntity.getWaybillNo();

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/job/WarehouseJob.java

@@ -0,0 +1,33 @@
+package com.logpm.basicdata.job;
+
+import com.logpm.basicdata.service.IBasicdataWarehouseService;
+import com.xxl.job.core.biz.model.ReturnT;
+import com.xxl.job.core.handler.annotation.XxlJob;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author zhaoqiaobo
+ * @create 2024-04-02
+ */
+@AllArgsConstructor
+@Component
+public class WarehouseJob {
+
+	private final IBasicdataWarehouseService warehouseService;
+
+	/**
+	 * 定时维护仓库库位
+	 *
+	 * @param param
+	 * @return
+	 * @throws Exception
+	 */
+	@XxlJob("initWarehouseSeating")
+	public ReturnT<String> initWarehouseSeating(String param) throws Exception {
+		warehouseService.initWarehouseSeating(param);
+		return ReturnT.SUCCESS;
+	}
+
+
+}

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

@@ -101,4 +101,5 @@ public interface BasicdataWarehouseMapper extends BaseMapper<BasicdataWarehouseE
 
     List<String> findBusunessLineList();
 
+	void initWarehouseSeating(@Param("warehouseId") String warehouseId);
 }

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

@@ -188,4 +188,19 @@
         group by business_line
     </select>
 
+    <update id="initWarehouseSeating">
+        update logpm_warehouse_warehouse tt
+            join(
+                select warehouse_id,count(*) total
+                from logpm_warehouse_goods_allocation
+                where is_deleted = 0
+                  and enable_status = 1
+                <if test="warehouseId != '' and warehouseId != null">
+                    and warehouse_id = #{warehouseId}
+                </if>
+                group by warehouse_id
+            ) ttt on tt.id = ttt.warehouse_id
+        set tt.seating = ttt.total,
+            tt.single_storage_location_area = case when tt.acreage = null then 0 else case when tt.acreage = 0 or ttt.total = 0 then 0 else  tt.acreage/ttt.total end end
+    </update>
 </mapper>

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

@@ -137,4 +137,6 @@ public interface IBasicdataWarehouseService extends BaseService<BasicdataWarehou
     Map<Long, String> findNamesMapByIds(List<Long> warehouseIds);
 
     R findBusunessLineList();
+
+    void initWarehouseSeating(String param);
 }

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

@@ -425,4 +425,9 @@ public class BasicdataWarehouseServiceImpl extends BaseServiceImpl<BasicdataWare
 		return R.data(busunessLineList);
 	}
 
+    @Override
+    public void initWarehouseSeating(String param) {
+        baseMapper.initWarehouseSeating(param);
+    }
+
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/ReportListener.java

@@ -6,6 +6,8 @@ import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONUtil;
 import com.logpm.distribution.pros.DistributionProperties;
 import com.logpm.distribution.service.IQualityDeliverService;
+import com.logpm.factorydata.feign.IFactoryDataClient;
+import com.logpm.factorydata.vo.SendMsg;
 import com.rabbitmq.client.Channel;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -39,6 +41,7 @@ public class ReportListener {
 	private final DistributionProperties destinationProperties;
 	private final List<ReportService> reportServices;
 	private final IQualityDeliverService qualityDeliverService;
+	private final IFactoryDataClient factoryDataClient;
 
 	@RabbitListener(bindings = @QueueBinding(
 		value = @Queue(name = FanoutConstants.DeliveryOfPickup.BillPlan.QUEUE.REPORT, durable = "true"),
@@ -251,7 +254,14 @@ public class ReportListener {
 		}
 		if (flag) {
 			try {
-				selectReportService(PlanReportListener.class).buildReport(msg);
+				// selectReportService(PlanReportListener.class).buildReport(msg);
+				// 延迟发送消息 延迟5秒 解决商配任务预约单未处理完的情况
+				factoryDataClient.sendMessage(SendMsg.builder()
+					.exchange(FanoutConstants.distribution.DeliveryAndPlan.EXCHANGE_DELAY)
+					.routingKey(null)
+					.message(msg)
+					.delay(5000)
+					.build());
 			} catch (Exception e) {
 				e.printStackTrace();
 				log.error("配送计划生成明细报表失败: {}", e.getMessage());

blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/service/impl/DeliveryNoteServiceImpl.java

@@ -190,7 +190,7 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl<DeliveryNoteMapper,
 		for (PushOrderDetailVO orderInfoVO : details) {
 			List<JSONObject> packageList = new ArrayList<>();
 			TrunklineAdvanceEntity advanceEntity = new TrunklineAdvanceEntity();
-			List<String> boxCodes = orderInfoVO.getBoxCodes();
+			List<String> boxCodes = ObjectUtil.isNotEmpty(orderInfoVO.getBoxCodes()) ? orderInfoVO.getBoxCodes() : new ArrayList<>();
 			advanceEntity.setTenantId(tenantId);
 			advanceEntity.setStatus(0);
 			advanceEntity.setIsDeleted(0);

blade-service/logpm-report/src/main/java/com/logpm/report/aspect/JobAnnotationAspect.java

@@ -0,0 +1,79 @@
+package com.logpm.report.aspect;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
+import lombok.AllArgsConstructor;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.springblade.common.cache.CacheNames;
+import org.springblade.common.component.MockLoginService;
+import org.springblade.core.redis.cache.BladeRedis;
+import org.springblade.core.redis.lock.LockType;
+import org.springblade.core.redis.lock.RedisLockClient;
+import org.springblade.core.tool.utils.ThreadLocalUtil;
+import org.springframework.core.env.Environment;
+import org.springframework.http.HttpHeaders;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.stereotype.Component;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+
+@Aspect
+@Component
+@AllArgsConstructor
+public class JobAnnotationAspect {
+	private final BladeRedis bladeRedis;
+	private final Environment environment;
+	private final RedisLockClient redisLockClient;
+	private final MockLoginService mockLoginService;
+	@Around("@annotation(com.xxl.job.core.handler.annotation.XxlJob)")
+	public Object xxlJobAnnotationMethods(ProceedingJoinPoint joinPoint) throws Throwable {
+
+
+		JSONObject jsonObject = mockLogin();
+		MockHttpServletRequest mockRequest = new MockHttpServletRequest();
+		mockRequest.addHeader("Blade-Auth", "bearer "+jsonObject.get("access_token"));
+		RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(mockRequest));
+
+		HttpHeaders httpHeaders = new HttpHeaders();
+		httpHeaders.add("Blade-Auth","bearer "+jsonObject.get("access_token") );
+		httpHeaders.add(	"Authorization", "Basic bG9jYWw6bG9jYWxfc2VjcmV0");
+		ThreadLocalUtil.put("bladeContext", httpHeaders);
+
+		DynamicDataSourceContextHolder.push(jsonObject.getString("tenant_id"));
+		// 执行原方法
+		Object result = joinPoint.proceed();
+		// 在方法执行后，从数据源上下文中移除租户ID
+		DynamicDataSourceContextHolder.poll();
+
+		return result;
+
+
+	}
+
+	private JSONObject mockLogin() throws InterruptedException {
+		String account ="shujutongbu";
+		String tenantId ="627683";
+		String key =CacheNames.LOCAL_SERVER_USER+tenantId+":"+account;
+		String lockKey =key+":lock";
+		JSONObject data =bladeRedis.get(key);
+		if(Objects.isNull(data)){
+			boolean flag = redisLockClient.tryLock(lockKey, LockType.FAIR, 5000, 10000, TimeUnit.MILLISECONDS);
+			if(flag){
+				data =bladeRedis.get(key);
+				if(Objects.isNull(data)){
+					data = mockLoginService.mockToken(tenantId,account);
+					bladeRedis.setEx(key,data,2591990L);
+					redisLockClient.unLock(lockKey, LockType.FAIR);
+				}
+			}
+		}
+		return data;
+	}
+
+
+}

blade-service/logpm-report/src/main/java/com/logpm/report/config/InterceptorAdapterConfig.java

@@ -0,0 +1,33 @@
+package com.logpm.report.config;
+
+
+import com.logpm.report.interceptor.LocalServerLoginAccountsInterceptor;
+import lombok.AllArgsConstructor;
+import org.springblade.common.component.MockLoginService;
+import org.springblade.core.redis.cache.BladeRedis;
+import org.springblade.core.redis.lock.RedisLockClient;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+/**
+ * 为所有的的
+ */
+@Configuration
+@AllArgsConstructor
+public class InterceptorAdapterConfig implements WebMvcConfigurer {
+
+
+	private final BladeRedis redis;
+
+	private final RedisLockClient redisLockClient;
+	private final MockLoginService mockLoginService;
+
+
+	@Override
+	public void addInterceptors(InterceptorRegistry interceptorRegistry) {
+
+		interceptorRegistry.addInterceptor(new LocalServerLoginAccountsInterceptor(redis,redisLockClient,mockLoginService)).addPathPatterns("/largeScreen/**").order(1);
+
+	}
+}

blade-service/logpm-report/src/main/java/com/logpm/report/config/XxlJobConfig.java

@@ -0,0 +1,74 @@
+package com.logpm.report.config;
+
+import com.xxl.job.core.executor.impl.XxlJobSpringExecutor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * xxl-job config
+ *
+ * @author xuxueli 2017-04-28
+ */
+@Configuration(proxyBeanMethods = false)
+public class XxlJobConfig {
+	private final Logger logger = LoggerFactory.getLogger(XxlJobConfig.class);
+
+	@Value("${xxl.job.admin.addresses}")
+	private String adminAddresses;
+
+	@Value("${xxl.job.executor.appname}")
+	private String appName;
+
+	@Value("${xxl.job.executor.ip}")
+	private String ip;
+
+	@Value("${xxl.job.executor.port}")
+	private int port;
+
+	@Value("${xxl.job.accessToken}")
+	private String accessToken;
+
+	@Value("${xxl.job.executor.logpath}")
+	private String logPath;
+
+	@Value("${xxl.job.executor.logretentiondays}")
+	private int logRetentionDays;
+
+
+	@Bean
+	public XxlJobSpringExecutor xxlJobExecutor() {
+		logger.info(">>>>>>>>>>> xxl-job config init.");
+		XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor();
+		xxlJobSpringExecutor.setAdminAddresses(adminAddresses);
+		xxlJobSpringExecutor.setAppName(appName);
+		xxlJobSpringExecutor.setIp(ip);
+		xxlJobSpringExecutor.setPort(port);
+		xxlJobSpringExecutor.setAccessToken(accessToken);
+		xxlJobSpringExecutor.setLogPath(logPath);
+		xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays);
+
+		return xxlJobSpringExecutor;
+	}
+
+	/**
+	 * 针对多网卡、容器内部署等情况，可借助 "spring-cloud-commons" 提供的 "InetUtils" 组件灵活定制注册IP；
+	 *
+	 *      1、引入依赖：
+	 *          <dependency>
+	 *             <groupId>org.springframework.cloud</groupId>
+	 *             <artifactId>spring-cloud-commons</artifactId>
+	 *             <version>${version}</version>
+	 *         </dependency>
+	 *
+	 *      2、配置文件，或者容器启动变量
+	 *          spring.cloud.inetutils.preferred-networks: 'xxx.xxx.xxx.'
+	 *
+	 *      3、获取IP
+	 *          String ip_ = inetUtils.findFirstNonLoopbackHostInfo().getIpAddress();
+	 */
+
+
+}

blade-service/logpm-report/src/main/java/com/logpm/report/controller/LargeScreenController.java

@@ -37,22 +37,22 @@ public class LargeScreenController{
 
 	public LargeScreenController(
 		// 正式使用是使用这个
-//		@Qualifier(value = "mapWarehouseServiceHttp") IMapWarehouseService mapWarehouseService,
+		@Qualifier(value = "mapWarehouseServiceHttp") IMapWarehouseService mapWarehouseService,
-//		@Qualifier(value = "billingDataServiceHttp") IBillingDataService billingDataService,
+		@Qualifier(value = "billingDataServiceHttp") IBillingDataService billingDataService,
-//		@Qualifier(value = "carsLoadDataServiceHttp") ICarsLoadDataService carsLoadDataService,
+		@Qualifier(value = "carsLoadDataServiceHttp") ICarsLoadDataService carsLoadDataService,
-//		@Qualifier(value = "nodeDataServiceHttp") INodeDataService nodeData,
+		@Qualifier(value = "nodeDataServiceHttp") INodeDataService nodeData,
-//		@Qualifier(value = "binLocationServiceHttp") IBinLocationService binLocation,
+		@Qualifier(value = "binLocationServiceHttp") IBinLocationService binLocation,
-//		@Qualifier(value = "trunkDataServiceHttp") ITrunkDataService trunkData,
+		@Qualifier(value = "trunkDataServiceHttp") ITrunkDataService trunkData,
-//		@Qualifier(value = "deliveryDataServiceHttp") IDeliveryDataService deliveryDataService,
+		@Qualifier(value = "deliveryDataServiceHttp") IDeliveryDataService deliveryDataService,
-//		@Qualifier(value = "businessRationServiceHttp") IBusinessRationService businessRatio
+		@Qualifier(value = "businessRationServiceHttp") IBusinessRationService businessRatio
-		IMapWarehouseService mapWarehouseService,
+//		IMapWarehouseService mapWarehouseService,
-		IBillingDataService billingDataService,
+//		IBillingDataService billingDataService,
-		ICarsLoadDataService carsLoadDataService,
+//		ICarsLoadDataService carsLoadDataService,
-		INodeDataService nodeData,
+//		INodeDataService nodeData,
-		IBinLocationService binLocation,
+//		IBinLocationService binLocation,
-		ITrunkDataService trunkData,
+//		ITrunkDataService trunkData,
-		IDeliveryDataService deliveryDataService,
+//		IDeliveryDataService deliveryDataService,
-		IBusinessRationService businessRatio
+//		IBusinessRationService businessRatio
 	) {
 		this.mapWarehouseService = mapWarehouseService;
 		this.billingDataService = billingDataService;

blade-service/logpm-report/src/main/java/com/logpm/report/interceptor/LocalServerLoginAccountsInterceptor.java

@@ -0,0 +1,100 @@
+package com.logpm.report.interceptor;
+
+import com.alibaba.fastjson.JSONObject;
+import lombok.AllArgsConstructor;
+import lombok.extern.log4j.Log4j2;
+import org.springblade.common.cache.CacheNames;
+import org.springblade.common.component.MockLoginService;
+import org.springblade.common.exception.CustomerException;
+import org.springblade.common.wrapper.CustomHttpServletRequestWrapper;
+import org.springblade.core.redis.cache.BladeRedis;
+import org.springblade.core.redis.lock.LockType;
+import org.springblade.core.redis.lock.RedisLockClient;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.StringUtil;
+import org.springblade.core.tool.utils.ThreadLocalUtil;
+import org.springframework.http.HttpHeaders;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+
+@Log4j2
+@AllArgsConstructor
+public class LocalServerLoginAccountsInterceptor extends HandlerInterceptorAdapter {
+
+	private final BladeRedis bladeRedis;
+	private final RedisLockClient redisLockClient;
+	private final MockLoginService mockLoginService;
+
+	@Override
+	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws CustomerException {
+
+
+		try {
+			CustomHttpServletRequestWrapper wrappedRequest = new CustomHttpServletRequestWrapper(request);
+			String account ="shujutongbu";
+			String tenantId = request.getHeader("tenantId");
+			tenantId = StringUtil.isBlank(tenantId)?"627683":tenantId;
+			String key =CacheNames.LOCAL_SERVER_USER+tenantId+":"+account;
+			String lockKey =key+":lock";
+			JSONObject data =bladeRedis.get(key);
+			if(Objects.isNull(data)){
+				boolean flag = redisLockClient.tryLock(lockKey, LockType.FAIR, 5000, 10000, TimeUnit.MILLISECONDS);
+				if(flag){
+					data =bladeRedis.get(key);
+					if(Objects.isNull(data)){
+						data = mockLoginService.mockToken(tenantId,account);
+						bladeRedis.setEx(key,data,2591990L);
+						redisLockClient.unLock(lockKey, LockType.FAIR);
+					}
+				}
+			}
+
+			// 修改或添加header
+
+			// 发送登录请求
+			log.info("##########preHandle: request={}", request);
+
+			wrappedRequest.addHeader("Blade-Auth", "bearer "+data.getString("access_token"));
+			HttpHeaders httpHeaders = new HttpHeaders();
+			httpHeaders.add("Blade-Auth","bearer "+data.get("access_token") );
+			httpHeaders.add(	"Authorization", "Basic bG9jYWw6bG9jYWxfc2VjcmV0");
+			ThreadLocalUtil.put("bladeContext", httpHeaders);
+
+
+			// 用包装后的request替换原始request
+			request = wrappedRequest;
+			RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request));
+			 return true;
+		} catch (Exception e) {
+			returnJson(response, JSONObject.toJSONString(R.fail(500, "服务异常，请联系管理员")));
+			return false;
+		}
+	}
+
+	private void returnJson(HttpServletResponse response, String json) {
+		PrintWriter writer = null;
+		response.setCharacterEncoding("UTF-8");
+		response.setContentType("application/json");
+		try {
+			writer = response.getWriter();
+			writer.print(json);
+
+		} catch (IOException e) {
+			System.out.println(e.getMessage());
+		} finally {
+			if (writer != null) {
+				writer.close();
+			}
+		}
+	}
+
+
+}

blade-service/logpm-report/src/main/java/com/logpm/report/job/LargeScreenQueryXxlJob.java

@@ -1,15 +1,19 @@
 package com.logpm.report.job;
 
 
+import com.alibaba.fastjson.JSON;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.logpm.report.entity.LargeScreenDataEntity;
 import com.logpm.report.mapper.largeScreen.LargeScreenDataMapper;
 import com.logpm.report.service.largeScreen.*;
 import com.logpm.report.vo.largeScreen.XxlJobQueryVO;
+import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import lombok.AllArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.stereotype.Component;
 
+import java.util.Date;
 import java.util.HashMap;
 
 /**
@@ -34,9 +38,8 @@ public class LargeScreenQueryXxlJob {
 	/**
 	 * 数据查询
 	 */
-	@XxlJob("LargeScreenQuery")
+	@XxlJob("largeScreenexExcute")
-	public void query()
+	public ReturnT<String> largeScreenexExcute(String param) {
-	{
 		XxlJobQueryVO xxlJobQueryVO = new XxlJobQueryVO();
 		xxlJobQueryVO.setMapWarehouse(mapWarehouseService.list());
 		xxlJobQueryVO.setBillingData(billingDataService.getBillingData());
@@ -64,7 +67,14 @@ public class LargeScreenQueryXxlJob {
 		data.put("deliveryData", xxlJobQueryVO.getDeliveryData());
 		data.put("deliveryYearData", xxlJobQueryVO.getDeliveryYearData());
 		data.put("businessRatio", xxlJobQueryVO.getBusinessRatio());
+		LargeScreenDataEntity largeScreenDataEntity = new LargeScreenDataEntity();
+		largeScreenDataEntity.setData(JSON.toJSONString(data));
+		largeScreenDataEntity.setCreateTime(new Date());
+		largeScreenDataEntity.setUpdateTime(new Date());
+		largeScreenDataEntity.setIsDeleted(0);
+		largeScreenDataEntity.setStatus(1);
+		largeScreenDataMapper.insert(largeScreenDataEntity);
 
-		largeScreenDataMapper.insert(new LargeScreenDataEntity(data));
+		return ReturnT.SUCCESS;
 	}
 }

blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.xml

@@ -686,11 +686,11 @@
         lww.destination_warehouse_name destinationWarehouseName,
         ldsa.warehouse warehouseName,
         ldsa.brand brand,
-        sum(ldsa.total_number) incomingNum,
+        sum(ldsa.incoming_num) incomingNum,
         IFNULL(sum(ltcls.num),0) outNum,
-        sum(if(ltcll.start_date <= DATE_ADD( ldsa.create_time, INTERVAL #{param.hoursTime} HOUR ),1,0)) outOnTimeNum,
+        sum(if(ltcll.start_date <= DATE_ADD( ldsa.create_time, INTERVAL #{param.hoursTime} HOUR ),ltcls.num,0)) outOnTimeNum,
-        IFNULL(round(sum(if(ltcll.start_date <= DATE_ADD( ldsa.create_time, INTERVAL #{param.hoursTime} HOUR ),1,0))/sum(ltcls.num)*100,2),'0.00') outOnTimeRate,
+        IFNULL(round(sum(if(ltcll.start_date <= DATE_ADD( ldsa.create_time, INTERVAL #{param.hoursTime} HOUR ),ltcls.num,0))/sum(ldsa.incoming_num)*100,2),'0.00') outOnTimeRate,
-        round(sum(TIMESTAMPDIFF(SECOND, ldsa.create_time, ltcll.start_date))/sum(ltcls.num)/3600,1) avgTime
+        round(sum(TIMESTAMPDIFF(SECOND, ldsa.create_time, ltcll.start_date)*ltcls.num)/sum(ltcls.num)/3600,1) avgTime
         from logpm_distribution_stock_article ldsa
         left join logpm_warehouse_warehouse waw on waw.id = ldsa.warehouse_id
         left join logpm_warehouse_waybill lww on lww.waybill_no = ldsa.order_code
@@ -750,11 +750,11 @@
         lww.destination_warehouse_name destinationWarehouseName,
         ldsa.warehouse warehouseName,
         ldsa.brand brand,
-        sum(ldsa.total_number) incomingNum,
+        sum(ldsa.incoming_num) incomingNum,
         IFNULL(sum(ltcls.num),0) outNum,
-        sum(if(ltcll.start_date <= DATE_ADD( ldsa.create_time, INTERVAL #{param.hoursTime} HOUR ),1,0)) outOnTimeNum,
+        sum(if(ltcll.start_date <= DATE_ADD( ldsa.create_time, INTERVAL #{param.hoursTime} HOUR ),ltcls.num,0)) outOnTimeNum,
-        IFNULL(concat(round(sum(if(ltcll.start_date <= DATE_ADD( ldsa.create_time, INTERVAL #{param.hoursTime} HOUR ),1,0))/sum(ltcls.num)*100,2),'%'),'0.00%') outOnTimeRate,
+        IFNULL(concat(round(sum(if(ltcll.start_date <= DATE_ADD( ldsa.create_time, INTERVAL #{param.hoursTime} HOUR ),ltcls.num,0))/sum(ldsa.incoming_num)*100,2),'%'),'0.00%') outOnTimeRate,
-        round(sum(TIMESTAMPDIFF(SECOND, ldsa.create_time, ltcll.start_date))/sum(ltcls.num)/3600,1) avgTime
+        round(sum(TIMESTAMPDIFF(SECOND, ldsa.create_time, ltcll.start_date)*ltcls.num)/sum(ltcls.num)/3600,1) avgTime
         from logpm_distribution_stock_article ldsa
         left join logpm_warehouse_warehouse waw on waw.id = ldsa.warehouse_id
         left join logpm_warehouse_waybill lww on lww.waybill_no = ldsa.order_code

blade-service/logpm-report/src/main/java/com/logpm/report/mapper/largeScreen/BillingDataMapper.xml

@@ -8,7 +8,7 @@
             sum(d.volume) as volume,
             count(d.id) as value
         from logpm_platform.logpm_warehouse_waybill as w
-            INNER JOIN logpm_platform.logpm_trunkline_advance_detail as d on w.waybill_no = d.waybill_no
+            INNER JOIN logpm_platform.logpm_trunkline_advance_detail as d on w.id = d.waybill_id
         where
             w.freeze_status = 0
             and w.create_time BETWEEN #{startTime} and #{endTime}

blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/httpImpl/BillingDataServiceImpl.java

@@ -1,6 +1,7 @@
 package com.logpm.report.service.largeScreen.httpImpl;
 
 import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.logpm.report.entity.LargeScreenDataEntity;
 import com.logpm.report.mapper.largeScreen.BillingDataMapper;
@@ -35,7 +36,7 @@ public class BillingDataServiceImpl implements IBillingDataService {
 
 		LargeScreenDataEntity largeScreenDataEntity = largeScreenDataMapper.selectOne(Wrappers.<LargeScreenDataEntity>lambdaQuery().orderByDesc(LargeScreenDataEntity::getCreateTime));
 
-		XxlJobQueryVO init = XxlJobQueryVO.init(largeScreenDataEntity.getData());
+		XxlJobQueryVO init = JSON.parseObject(largeScreenDataEntity.getData(), XxlJobQueryVO.class);
 
 		return init.getBillingData();
 	}
@@ -44,9 +45,15 @@ public class BillingDataServiceImpl implements IBillingDataService {
 	public List<WarehouseBillingDataVO> getWarehouseBillingData() {
 		LargeScreenDataEntity largeScreenDataEntity = largeScreenDataMapper.selectOne(Wrappers.<LargeScreenDataEntity>lambdaQuery().orderByDesc(LargeScreenDataEntity::getCreateTime));
 
-		XxlJobQueryVO init = XxlJobQueryVO.init(largeScreenDataEntity.getData());
+		XxlJobQueryVO init = JSON.parseObject(largeScreenDataEntity.getData(), XxlJobQueryVO.class);
 
-		return init.getWarehouseBillingData();
+		List<WarehouseBillingDataVO> warehouseBillingData = init.getWarehouseBillingData();
+
+		// 按照开单件数 倒序排列
+		warehouseBillingData.sort((o1, o2) -> o2.getValue() - o1.getValue());
+
+
+		return warehouseBillingData;
 	}
 
 	@Override
@@ -56,7 +63,7 @@ public class BillingDataServiceImpl implements IBillingDataService {
 		if (largeScreenDataEntity == null) {
 			return new ArrayList<>();
 		}
-		XxlJobQueryVO init = XxlJobQueryVO.init(largeScreenDataEntity.getData());
+		XxlJobQueryVO init = JSON.parseObject(largeScreenDataEntity.getData(), XxlJobQueryVO.class);
 
 		return init.getMonthBillingData();
 	}

blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/httpImpl/BinLocationServiceImpl.java

@@ -1,5 +1,6 @@
 package com.logpm.report.service.largeScreen.httpImpl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.logpm.report.entity.LargeScreenDataEntity;
 import com.logpm.report.mapper.largeScreen.BinLocationMapper;
@@ -25,7 +26,7 @@ public class BinLocationServiceImpl implements IBinLocationService {
 		if (largeScreenDataEntity == null) {
 			return new BinLocationDataVO();
 		}
-		XxlJobQueryVO init = XxlJobQueryVO.init(largeScreenDataEntity.getData());
+		XxlJobQueryVO init = JSON.parseObject(largeScreenDataEntity.getData(), XxlJobQueryVO.class);
 
 		return init.getBinLocationData();
 	}

blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/httpImpl/BusinessRationServiceImpl.java

@@ -1,5 +1,6 @@
 package com.logpm.report.service.largeScreen.httpImpl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.logpm.report.entity.LargeScreenDataEntity;
 import com.logpm.report.mapper.largeScreen.BusinessRatioMapper;
@@ -27,7 +28,7 @@ public class BusinessRationServiceImpl implements IBusinessRationService {
 		if (largeScreenDataEntity == null) {
 			return new BusinessRatioDataVO();
 		}
-		XxlJobQueryVO init = XxlJobQueryVO.init(largeScreenDataEntity.getData());
+		XxlJobQueryVO init = JSON.parseObject(largeScreenDataEntity.getData(), XxlJobQueryVO.class);
 
 		return init.getBusinessRatio();
 	}

blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/httpImpl/CarsLoadDataServiceImpl.java

@@ -1,5 +1,6 @@
 package com.logpm.report.service.largeScreen.httpImpl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.logpm.report.entity.LargeScreenDataEntity;
 import com.logpm.report.mapper.largeScreen.CarsLoadDataMapper;
@@ -39,7 +40,7 @@ public class CarsLoadDataServiceImpl implements ICarsLoadDataService {
 			return new ArrayList<>();
 		}
 
-		XxlJobQueryVO init = XxlJobQueryVO.init(largeScreenDataEntity.getData());
+		XxlJobQueryVO init = JSON.parseObject(largeScreenDataEntity.getData(), XxlJobQueryVO.class);
 
 		return isDelivery.equals(1)
 			? init.getCareerLineDeliveryData()

blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/httpImpl/DeliveryDataServiceImpl.java

@@ -1,5 +1,6 @@
 package com.logpm.report.service.largeScreen.httpImpl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.logpm.report.entity.LargeScreenDataEntity;
 import com.logpm.report.mapper.largeScreen.DeliveryDataMapper;
@@ -29,7 +30,7 @@ public class DeliveryDataServiceImpl implements IDeliveryDataService {
 			return new DeliveryDataVO();
 		}
 
-		XxlJobQueryVO init = XxlJobQueryVO.init(largeScreenDataEntity.getData());
+		XxlJobQueryVO init = JSON.parseObject(largeScreenDataEntity.getData(), XxlJobQueryVO.class);
 
 		return isYear.equals(1)
 			? init.getDeliveryYearData()

blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/httpImpl/MapWarehouseServiceImpl.java

@@ -1,6 +1,7 @@
 package com.logpm.report.service.largeScreen.httpImpl;
 
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.logpm.report.entity.LargeScreenDataEntity;
 import com.logpm.report.mapper.largeScreen.LargeScreenDataMapper;
@@ -35,7 +36,7 @@ public class MapWarehouseServiceImpl implements IMapWarehouseService {
 		if (largeScreenDataEntity == null) {
 			return new ArrayList<>();
 		}
-		XxlJobQueryVO init = XxlJobQueryVO.init(largeScreenDataEntity.getData());
+		XxlJobQueryVO init = JSON.parseObject(largeScreenDataEntity.getData(), XxlJobQueryVO.class);
 
 		return init.getMapWarehouse();
 	}

blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/httpImpl/NodeDataServiceImpl.java

@@ -1,5 +1,6 @@
 package com.logpm.report.service.largeScreen.httpImpl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.logpm.report.entity.LargeScreenDataEntity;
 import com.logpm.report.mapper.largeScreen.LargeScreenDataMapper;
@@ -25,7 +26,7 @@ public class NodeDataServiceImpl implements INodeDataService {
 		if (largeScreenDataEntity == null) {
 			return new NodeDataVO();
 		}
-		XxlJobQueryVO init = XxlJobQueryVO.init(largeScreenDataEntity.getData());
+		XxlJobQueryVO init = JSON.parseObject(largeScreenDataEntity.getData(), XxlJobQueryVO.class);
 
 		return init.getNodeData();
 	}

blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/httpImpl/TrunkDataServiceImpl.java

@@ -1,5 +1,6 @@
 package com.logpm.report.service.largeScreen.httpImpl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.logpm.report.entity.LargeScreenDataEntity;
 import com.logpm.report.mapper.largeScreen.LargeScreenDataMapper;
@@ -30,7 +31,7 @@ public class TrunkDataServiceImpl implements ITrunkDataService {
 			return new TrunkDataVO();
 		}
 
-		XxlJobQueryVO init = XxlJobQueryVO.init(largeScreenDataEntity.getData());
+		XxlJobQueryVO init = JSON.parseObject(largeScreenDataEntity.getData(), XxlJobQueryVO.class);
 
 		return init.getTrunkData();
 	}

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java

@@ -1094,6 +1094,14 @@ public class CarsLoadController {
 //			}
 
 			carsLoadService.unloadByLoadId(loadCarsDTO);
+			try{
+
+				carsLoadService.sendStationArrivedEnter(loadCarsDTO);
+
+			}catch (Exception e){
+				log.error("############sendOrders: 发送卸车数据异常",e);
+			}
+
 			return R.success("操作成功");
 		} catch (CustomerException e) {
 			log.error(e.message, e);

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadService.java

@@ -285,4 +285,5 @@ public interface ITrunklineCarsLoadService extends BaseService<TrunklineCarsLoad
 
 	void saveCostShareRecord(Long loadId);
 
+	void sendStationArrivedEnter(LoadCarsDTO loadCarsDTO);
 }

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

@@ -19,9 +19,7 @@ import com.logpm.basic.feign.IBasicCarModelClient;
 import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
 import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
 import com.logpm.distribution.entity.DistributionParcelListEntity;
-import com.logpm.distribution.entity.DistributionReservationEntity;
 import com.logpm.distribution.entity.DistributionStockArticleEntity;
-import com.logpm.distribution.entity.DistrilbutionBillLadingEntity;
 import com.logpm.distribution.feign.IDistributionParcelListClient;
 import com.logpm.distribution.feign.IDistributionStockArticleClient;
 import com.logpm.factorydata.enums.BrandEnums;
@@ -50,7 +48,6 @@ import org.springblade.common.exception.CustomerException;
 import org.springblade.common.model.FanoutMsg;
 import org.springblade.common.model.NodeFanoutMsg;
 import org.springblade.common.model.PackageData;
-import org.springblade.common.model.StockUpVO;
 import org.springblade.common.model.workNode.StationArrivedByLineStationVO;
 import org.springblade.common.model.workNode.StationArrivedEnterVO;
 import org.springblade.common.utils.CommonUtil;
@@ -477,7 +474,7 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
 				abnormalRecordEntity.setOrderPackageCode(scanCode);
 				abnormalRecordEntity.setUpUserId(userId);
 				abnormalRecordEntity.setUpUserName(nickName);
-				abnormalRecordEntity.setAbnormalStatus(0);
+				abnormalRecordEntity.setAbnormalStatus(1);
 				abnormalRecordEntity.setUpTime(new Date());
 				abnormalRecordEntity.setAssociationId(scanId);
 				abnormalRecordEntity.setAssociationType(1);

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

@@ -2909,6 +2909,9 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		String warehouseName = openOrderDTO.getWarehouseName();
 		String editReson = openOrderDTO.getEditReson();
 		String refer = openOrderDTO.getRefer();
+		if(StringUtil.isBlank(refer)){
+			refer = " ";
+		}
 		List<TrunklineAdvanceDetailEntity> updateAdvanceDetailList = openOrderDTO.getUpdateAdvanceDetailList();
 		WarehouseWaybillEntity waybillEntity = warehouseWaybillClient.findByWaybillId(waybillId);
 
@@ -2986,6 +2989,8 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 
 		String updateMsg = verifyUpdateData(openOrderDTO, waybillEntity);
 
+		waybillEntity.setUpdateStatus(1);
+
 		warehouseWaybillClient.updateEntity(waybillEntity);
 
 		if (CollUtil.isNotEmpty(updateAdvanceDetailList)) {

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

@@ -13,11 +13,7 @@ import com.logpm.basicdata.entity.BasicdataBrandEntity;
 import com.logpm.basicdata.entity.BasicdataClientEntity;
 import com.logpm.basicdata.entity.BasicdataStoreBusinessEntity;
 import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
-import com.logpm.basicdata.feign.IBasicdataBrandClient;
+import com.logpm.basicdata.feign.*;
-import com.logpm.basicdata.feign.IBasicdataClientClient;
-import com.logpm.basicdata.feign.IBasicdataStoreBusinessClient;
-import com.logpm.basicdata.feign.IBasicdataTripartiteMallClient;
-import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
 import com.logpm.distribution.dto.FindParamterDTO;
 import com.logpm.distribution.entity.DistributionParcelListEntity;
 import com.logpm.distribution.entity.DistributionStockArticleEntity;
@@ -31,8 +27,6 @@ import com.logpm.trunkline.entity.TrunklineAdvanceEntity;
 import com.logpm.trunkline.mapper.TrunklineAdvanceMapper;
 import com.logpm.trunkline.service.ITrunklineAdvanceDetailService;
 import com.logpm.trunkline.service.ITrunklineAdvanceService;
-import com.logpm.trunkline.service.ITrunklineCarsLoadService;
-import com.logpm.trunkline.service.ITrunklineDetailProductService;
 import com.logpm.trunkline.vo.CustomerInfoVO;
 import com.logpm.trunkline.vo.OpenOrderVO;
 import com.logpm.trunkline.vo.TrunklineAdvanceVO;
@@ -51,14 +45,7 @@ import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -635,7 +622,13 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 				}
 
 				Integer stockCount = waybillEntity.getStockCount();
+				Integer totalCount = waybillEntity.getTotalCount();
+				if(stockCount >= totalCount){
+					waybillEntity.setStockCount(totalCount);
+				}else{
 					waybillEntity.setStockCount(stockCount + 1);
+				}
+
 
 			}
 			parcelList.setConditions(1);

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

@@ -1,5 +1,6 @@
 package com.logpm.trunkline.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.logpm.trunkline.entity.TrunklineCarsLoadLinePhotoEntity;
 import com.logpm.trunkline.mapper.TrunklineCarsLoadLinePhotoMapper;
@@ -9,6 +10,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Service
@@ -29,10 +31,14 @@ public class TrunklineCarsLoadLinePhotoEntityServiceImpl extends BaseServiceImpl
 
 	@Override
 	public List<TrunklineCarsLoadLinePhotoEntity> findListByLoadIdListAndWarehouseId(List<Long> idList, Long warehouseId) {
+		List<TrunklineCarsLoadLinePhotoEntity> ls = new ArrayList<>();
+		if(CollUtil.isNotEmpty(idList)){
 			QueryWrapper<TrunklineCarsLoadLinePhotoEntity> queryWrapper = new QueryWrapper<>();
 			queryWrapper.in("load_id",idList)
 				.eq("warehouse_id",warehouseId);
-		List<TrunklineCarsLoadLinePhotoEntity> trunklineCarsLoadLinePhotoEntities = baseMapper.selectList(queryWrapper);
+			ls = baseMapper.selectList(queryWrapper);
-		return trunklineCarsLoadLinePhotoEntities;
+		}
+
+		return ls;
 	}
 }

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

@@ -1527,9 +1527,9 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		}
 		trunklineCarsLoadLineService.updateById(updateUnloadStatus);
 
-		String brands = trunklineCarsLoadScanService.findBrandNameByCarLoadCode(carsLoadEntity.getCarsNo());
+//		String brands = trunklineCarsLoadScanService.findBrandNameByCarLoadCode(carsLoadEntity.getCarsNo());
-		// 发送卸车作业事件
+//		// 发送卸车作业事件
-		carsLoadAsyncService.sendStationArrivedEnter(carsLoadEntity,brands, AuthUtil.getUser(), warehouseEntity);
+//		carsLoadAsyncService.sendStationArrivedEnter(carsLoadEntity,brands, AuthUtil.getUser(), warehouseEntity);
 
 	}
 
@@ -5590,6 +5590,19 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 
 	}
 
+	@Override
+	public void sendStationArrivedEnter(LoadCarsDTO loadCarsDTO) {
+		Long warehouseId = loadCarsDTO.getWarehouseId();
+		Long loadId = loadCarsDTO.getLoadId();
+		TrunklineCarsLoadEntity carsLoadEntity = baseMapper.selectById(loadId);
+
+		BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(warehouseId);
+
+		String brands = trunklineCarsLoadScanService.findBrandNameByCarLoadCode(carsLoadEntity.getCarsNo());
+		// 发送卸车作业事件
+		carsLoadAsyncService.sendStationArrivedEnter(carsLoadEntity,brands, AuthUtil.getUser(), warehouseEntity);
+	}
+
 	private void updateParcelListToWarehouse(TrunklineAdvanceDetailEntity advanceDetailEntity, Long warehouseId, String status) {
 		String orderPackageCode = advanceDetailEntity.getOrderPackageCode();
 		String orderCode = advanceDetailEntity.getOrderCode();

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

@@ -195,6 +195,7 @@
         lww.warehouse_management_fee warehouseManagementFee,
         lww.sorting_fee sortingFee,
         lww.handling_fee handlingFee,
+        lww.install_fee installFee,
         lww.claiming_value claimingValue,
         lww.rebate rebate,
         lww.urgency urgency,
@@ -216,6 +217,7 @@
         lww.sign_check_user_name signCheckUserName,
         lww.sign_check_time signCheckTime,
         IFNULL(lww.check_status,0) checkStatus,
+        IFNULL(lww.update_status,0) updateStatus,
         lww.check_reson checkReson,
         lww.check_remark checkRemark,
         lww.check_user_name checkUserName,
@@ -1016,6 +1018,7 @@
         lww.warehouse_management_fee warehouseManagementFee,
         lww.sorting_fee sortingFee,
         lww.handling_fee handlingFee,
+        lww.install_fee installFee,
         lww.claiming_value claimingValue,
         lww.rebate rebate,
         lww.pay_type payType,
@@ -1034,7 +1037,8 @@
         lww.freeze_status freezeStatus,
         lww.freeze_user_name freezeUserName,
         lww.freeze_time freezeTime,
-        lww.check_status checkStatus,
+        IFNULL(lww.check_status,0) checkStatus,
+        IFNULL(lww.update_status,0) updateStatus,
         lww.check_reson checkReson,
         lww.check_remark checkRemark,
         lww.check_user_name checkUserName,