Merge branch 'dev' into pre-production

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

@@ -1179,7 +1179,7 @@
         ldpl.quantity AS num,
         ldl.signfor_state AS type,
         ldl.scan_time AS operateTime,
-        ldl.created_user AS administratorsId,
+        ldl.create_user AS administratorsId,
         IF
         ( ldl.id IS NOT NULL, 1, ldl.id ) AS is_loading,
         1 is_out,

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

@@ -5510,6 +5510,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 							distributionLoadscanEntity.setSignforState(LoadScanSigningStatusConstant.yiqianshou.getValue());
 							distributionLoadscanEntity.setScanTime(simpleDateFormat.format(new Date()));
 							distributionLoadscanEntity.setSigningUser(user.getNickName());
+							distributionLoadscanEntity.setSigningUserId(user.getUserId());
+							distributionLoadscanEntity.setSigningTime(simpleDateFormat.format(new Date()));
+							distributionLoadscanEntity.setSigningUser(user.getNickName());
 							loadingNumber += distributionLoadscanEntity.getLoadedNub();
 							signingNumber += distributionLoadscanEntity.getReceivedQuantity();
 							//进行签收数量的统计

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

@@ -6,6 +6,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
 import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
 import com.logpm.trunkline.dto.*;
+import com.logpm.trunkline.entity.TrunklineCarsLoadEntity;
 import com.logpm.trunkline.service.ITrunklineCarsLoadService;
 import com.logpm.trunkline.vo.LoadingDetailExportVO;
 import com.logpm.trunkline.vo.TrunklineCarsLoadVO;
@@ -17,7 +18,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.exception.CustomerException;
 import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springframework.web.bind.annotation.*;
 
@@ -1200,9 +1200,10 @@ public class CarsLoadController {
 	public void loadingDetailExport(@RequestBody LoadCarsDTO loadCarsDTO, HttpServletResponse response) {
 		String method = "############loadingDetailExport: ";
 		log.info(method+"请求参数{}",loadCarsDTO);
+		TrunklineCarsLoadEntity carsLoadEntity = carsLoadService.getById(loadCarsDTO.getLoadId());
 		List<LoadingDetailExportVO> ls = carsLoadService.loadingDetailExport(loadCarsDTO);
 		//导出ls
-		ExcelUtil.export(response, "未盘点任务数据" + DateUtil.time(), "未盘点任务数据数据表", ls, LoadingDetailExportVO.class);
+		ExcelUtil.export(response, "装车明细数据"+carsLoadEntity.getCarsNo(), "装车明细", ls, LoadingDetailExportVO.class);
 	}
 
 

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

@@ -293,7 +293,7 @@
         lww.remark remark,
         lww.waybill_type type,
         IFNULL(ltco.total_num,0) totalNum,
-        IF(lww.waybill_type = 1,count( ldpl.id ),SUM(ldpl.quantity)) stockNum,
+        IF(lww.waybill_type = 1,count( ldpl.id ),SUM(ldpl.quantity))-ltco.real_num stockNum,
         ltco.plan_num planNum,
         ltco.real_num realNum,
         IFNULL(TRUNCATE(lww.total_freight/lww.total_count,4),0) price,
@@ -304,7 +304,6 @@
         where ltco.load_id = #{param.loadId}
         and ltco.final_node_id = #{param.finalNodeId}
         and ldpl.is_deleted = 0
-        and ldpl.order_package_status in ('20','30','60')
         <if test="param.warehouseId != null">
             and ldpl.warehouse_id = #{param.warehouseId}
         </if>