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

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

@@ -140,4 +140,7 @@ public interface IDistributionParcelListClient {
 
 	@GetMapping(API_PREFIX+"/findByWaybillNumber")
 	List<DistributionParcelListEntity> findByWaybillNumber(@RequestParam String waybillNumber);
+
+	@GetMapping(API_PREFIX+"/findEntityListByOrderCodeAndStatus")
+	List<DistributionParcelListEntity> findEntityListByOrderCodeAndStatus(@RequestParam String orderCode, @RequestParam Long warehouseId, @RequestParam String packageStatus);
 }

blade-service-api/logpm-supervise-api/pom.xml

@@ -13,5 +13,12 @@
     <artifactId>logpm-supervise-api</artifactId>
     <version>3.2.0.RELEASE</version>
 
+    <dependencies>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-starter-excel</artifactId>
+        </dependency>
+    </dependencies>
+
 
 </project>

blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/dto/ClassifyDTO.java

@@ -11,6 +11,7 @@ import java.util.List;
 public class ClassifyDTO extends ClassifyEntity {
 
 	private String ids;
+	private String createDeptName;
 
 	private Integer isPid;
 

blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/dto/ImportClassifyDTO.java

@@ -0,0 +1,35 @@
+package com.logpm.supervise.dto;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class ImportClassifyDTO implements Serializable {
+
+	@ExcelProperty(value = "考核指标归属部门")
+	private String createDeptName;
+
+	@ExcelProperty(value = "考核范围")
+	private String examineDeptName;
+
+	@ExcelProperty(value = "指标分类")
+	private String parentClassifyName;
+
+	@ExcelProperty(value = "指标分类描述")
+	private String parentClassifyDesc;
+
+	@ExcelProperty(value = "指标分类备注")
+	private String parentClassifyRemark;
+
+	@ExcelProperty(value = "指标名称")
+	private String classifyName;
+
+	@ExcelProperty(value = "指标描述")
+	private String classifyDesc;
+
+	@ExcelProperty(value = "积分值")
+	private String points;
+
+}

blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/dto/IndicatorsDTO.java

@@ -27,4 +27,8 @@ public class IndicatorsDTO extends IndicatorsEntity {
 	private Date start;
 	private Date end;
 
+	private Integer isCommit;
+
+	private String createDeptName;
+
 }

blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/entity/ClassifyEntity.java

@@ -17,10 +17,9 @@
 package com.logpm.supervise.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
+import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.tenant.mp.TenantEntity;
 
@@ -52,9 +51,21 @@ public class ClassifyEntity extends TenantEntity {
 	@ApiModelProperty(value = "备注")
 	private String remark;
 	/**
-	 * 是否是父指标  默认为0 
+	 * 是否是父指标  默认为0
 	 */
 	@ApiModelProperty(value = "是否是父指标  默认为0 ")
 	private Long pId;
 
+	/**
+	 * 考核部门id
+	 */
+	@ApiModelProperty(value = "考核部门id ")
+	private Long examineDeptId;
+
+	/**
+	 * 考核部门名称
+	 */
+	@ApiModelProperty(value = "考核部门名称 ")
+	private String examineDeptName;
+
 }

blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/entity/IndicatorsEntity.java

@@ -45,5 +45,7 @@ public class IndicatorsEntity  extends TenantEntity {
 	@ApiModelProperty(value = "异议备注")
 	private String objectionRemark;
 
+	@ApiModelProperty(value = "申述原因")
+	private String appealReason;
 
 }

blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/ClassifyVO.java

@@ -36,10 +36,12 @@ public class ClassifyVO extends ClassifyEntity {
 	private static final long serialVersionUID = 1L;
 
 	private String parentClassifyName;
+	private String createDeptName;
 
 	private List<PointsEntity> pointsEntities = new ArrayList<>();
 
 	private List<PointsVO> pointsVOS ;
 
+	private Integer isEdit;
 
 }

blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/ExportIndicatorsVO.java

@@ -0,0 +1,48 @@
+package com.logpm.supervise.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class ExportIndicatorsVO implements Serializable {
+
+	@ExcelProperty(value = "考核指标归属部门")
+	private String createDeptName;
+	@ExcelIgnore
+	private Long createDept;
+	@ExcelProperty(value = "考核范围")
+	private String examineDeptName;
+	@ExcelIgnore
+	private Long examineDeptId;
+	@ExcelProperty(value = "指标分类")
+	private String parentClassifyName;
+	@ExcelProperty(value = "指标分类描述")
+	private String parentClassifyDesc;
+	@ExcelProperty(value = "指标分类备注")
+	private String parentClassifyRemark;
+	@ExcelProperty(value = "指标名称")
+	private String classifyName;
+	@ExcelProperty(value = "指标描述")
+	private String classifyDesc;
+	@ExcelProperty(value = "考核描述")
+	private String indicatorsRemark;
+	@ExcelProperty(value = "积分值")
+	private String point;
+	@ExcelProperty(value = "考核时间")
+	private String createTime;
+	@ExcelProperty(value = "考评人")
+	private String createUserName;
+	@ExcelIgnore
+	private Long createUser;
+	@ExcelProperty(value = "考核部门")
+	private String assessDeptName;
+	@ExcelProperty(value = "考核人")
+	private String assessUserName;
+	@ExcelProperty(value = "整改结果")
+	private String objectionRemark;
+	@ExcelProperty(value = "整改反馈")
+	private String appealReason;
+}

blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/IndicatorsVO.java

@@ -15,6 +15,9 @@ public class IndicatorsVO extends IndicatorsEntity {
 
 	private String classifyName;
 
+	private String createDeptName;
+	private String indicatorsStatusName;
+
 	private Long parentClassifyId;
 
 	private String createdUserName;
@@ -25,8 +28,17 @@ public class IndicatorsVO extends IndicatorsEntity {
 
 	private String parentClassifyName;
 
+	private String examineDeptName;
+
+	private String deduction;
+
+
+	private List<PointsVO> PointsVOS = new ArrayList<>();
+
 	private List<IndicatorsAnnexEntity> pictures = new ArrayList<>();
 
 	private List<IndicatorsAnnexEntity> files = new ArrayList<>();
 
+	private Integer isEdit;
+
 }

blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/api/ClassifyApiVO.java

@@ -15,4 +15,6 @@ public class ClassifyApiVO extends ClassifyEntity {
 	private List<ClassifyApiVO> children;
 
 	private List<PointsVO> pointsVOS;
+
+	private Integer isCommit;
 }

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;//目的仓
+
 }

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

@@ -8,6 +8,7 @@ import lombok.Data;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 @Data
@@ -87,4 +88,26 @@ public class LoadCarsDTO implements Serializable {
 
 	private String signOrderIds;
 
+	private String openTimeStartStr;
+	private String openTimeEndStr;
+
+	private Date openTimeStart;
+	private Date openTimeEnd;
+
+
+	private String enterTimeStartStr;
+	private String enterTimeEndStr;
+
+	private Date enterTimeStart;
+	private Date enterTimeEnd;
+
+	private String destination;
+
+	private String destinationWarehouseName;
+	private String productName;
+	private String shipper;
+	private String consignee;
+	private String customerTrain;
+	private String remark;
+
 }

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

@@ -34,5 +34,6 @@ public class CarsLoadAllOrderVO implements Serializable {
 	private BigDecimal freight;//运费
 	private String productName;//品类
 	private String type;//类型
+	private Date warehouseEntryTimeEnd;//入库时间
 
 }

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;//收货人地址

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml

@@ -121,10 +121,11 @@ date_format(from_unixtime(create_time),'%Y-%m-%d') = date_format(now(),'%Y-%m-%d
             <if test="param.overTime != null  ">and date_format(from_unixtime(lawo.over_time),'%Y-%m-%d') = date_format(#{param.overTime}),'%Y-%m-%d') </if>
             <if test="param.waybillMall != null and param.waybillMall != '' ">and  lawo.waybill_mall like concat('%', #{param.waybillMall },'%') </if>
             <if test="param.deliveryDriver != null and param.deliveryDriver != '' ">and  lawo.delivery_driver = #{param.deliveryDriver } </if>
-            <if test="param.customerServiceState != null and param.customerServiceState == 30 "> and  lawo.work_order_status in ('30','40')  </if>
+            <if test="param.customerServiceState != null and param.customerServiceState == 30 "> and  lawo.work_order_status in ('40')  </if>
+            <if test="param.customerServiceState != null and param.customerServiceState == 40 "> and  lawo.work_order_status in ('20')  </if>
             <if test="param.customerServiceState != null and param.customerServiceState == 31 "> and  lawo.work_order_status in ('30')  </if>
-            <if test="param.customerServiceState != null and param.customerServiceState == 20 "> and  lawo.work_order_status in ('30')  </if>
-            <if test="param.customerServiceState != null and param.customerServiceState == 10 "> and  lawo.work_order_status in ('80','100')  </if>
+            <if test="param.customerServiceState != null and param.customerServiceState == 60 "> and  lawo.work_order_status in ('30')  </if>
+            <if test="param.customerServiceState != null and param.customerServiceState == 10 "> and  lawo.work_order_status in ('70','80')  </if>
             <if test="param.customerServiceId != null and param.customerServiceId != '' ">and  lawo.customer_service_id = #{param.customerServiceId } </if>
             <if test="param.customerServiceName != null and param.customerServiceName != '' ">and  lawo.customer_service_name like concat('%', #{param.customerServiceName },'%') </if>
             <if test="param.waybillMallId != null and param.waybillMallId != '' ">and  lawo.waybill_mall_id = #{param.waybillMallId } </if>
@@ -142,10 +143,7 @@ date_format(from_unixtime(create_time),'%Y-%m-%d') = date_format(now(),'%Y-%m-%d
             <if test="param.customerIdentification != null and param.customerIdentification == 1 ">
                      and  lawo.work_order_status IN ( '10', '20', '21', '30', '40', '50', '60', '70', '80', '90' ,'100','110')
             </if>
-            <if test="param.handleStatus!= null and param.handleStatus == 30">and  lawo.work_order_status in (21,30) and lap.processing_status = '4'  and lap.business_id = #{param.warehouseId} </if>
-<!--            <if test="param.handleStatus!= null and param.handleStatus == 10 ">and  lawo.warehouse_id = #{param.warehouseId}  </if>-->
-            <if test="param.handleStatus!= null and param.handleStatus == 20 ">and lawo.work_order_status in (80,100) and lacr.warehouse_id=#{param.warehouseId}   </if>
-       <if test="param.handleStatus != null "> or 1=1 </if>
+            <if test="param.handleStatus != null "> or 1=1 </if>
             <if test="param.workOrderType != null and param.workOrderType != '' ">and  lawo.work_order_type = #{param.workOrderType } </if>
             <if test="param.discoveryNode != null and param.discoveryNode != '' ">and  lawo.discovery_node = #{param.discoveryNode } </if>
             <if test="param.workOrderNumber != null and param.workOrderNumber != '' ">and  lawo.work_order_number like concat('%',#{param.workOrderNumber },'%')  </if>
@@ -158,11 +156,12 @@ date_format(from_unixtime(create_time),'%Y-%m-%d') = date_format(now(),'%Y-%m-%d
             <if test="param.warehouseId != null and param.warehouseId != '' and param.handleStatus != 20  "> and lap.business_id = #{param.warehouseId}  </if>
             <if test="param.workOrderStatus != null and param.workOrderStatus != '' and param.handleStatus != 40 "> and  lawo.work_order_status in ( #{param.workOrderStatus }) </if>
 <!--            <if test="param.workOrderStatus != null and param.workOrderStatus != '' and param.customerServiceState == null "> and  lawo.work_order_status in ( #{param.workOrderStatus }) and lap.types_of = '2' </if>-->
-            <if test="param.handleStatus != null and param.handleStatus == 40 "> and  lawo.work_order_status in ('10','20' ) and lap.types_of = '2' and lap.processing_status in ('1')  </if>
-            <if test="param.handleStatus!= null and param.handleStatus == 10 ">and   lap.types_of = '2' </if>
-            <if test="param.handleStatus!= null and param.handleStatus == 30">and  lawo.work_order_status in (21,30,40) and lap.processing_status = '4'  </if>
-            <if test="param.handleStatus!= null and param.handleStatus == 20 ">and lawo.work_order_status in (80,100)  and lacr.warehouse_id=#{param.warehouseId} </if>
-            <if test="param.customerServiceState!= null and param.customerServiceState == 80 ">and lawo.work_order_status in (20,30,10,40,60,100,21,70)   </if>
+            <if test="param.handleStatus != null and param.handleStatus == 40 "> and  lawo.work_order_status in ('10') and lap.types_of = '2' and lap.processing_status in ('1')  </if>
+            <if test="param.handleStatus != null and param.handleStatus == 50 "> and  lawo.work_order_status in ('20') and lap.types_of = '2'  </if>
+            <if test="param.handleStatus!= null and param.handleStatus == 10 ">and  lap.types_of = '2' </if>
+            <if test="param.handleStatus!= null and param.handleStatus == 30">and  lawo.work_order_status in (21,30) and lap.processing_status = '4'  </if>
+            <if test="param.handleStatus!= null and param.handleStatus == 20 ">and lawo.work_order_status in (80,100,70)  and lacr.warehouse_id=#{param.warehouseId} </if>
+            <if test="param.customerServiceState!= null and param.customerServiceState == 80 ">and lawo.work_order_status in ('10')   </if>
             ORDER BY lawo.create_time DESC
         </where>
 
@@ -397,7 +396,7 @@ date_format(from_unixtime(create_time),'%Y-%m-%d') = date_format(now(),'%Y-%m-%d
         las.work_order_type workOrderType,las.result_type resultType,las.laprId,  las.discovery_node discoveryNode, las.result_description resultDescription,
         las.vehicle_route vehicleRoute,las.indemnitor,las.reason,las.money,las.lawoId,las.create_time createTime,las.process_number processNumber,
         las.work_order_status workOrderStatus
-        from logpm_aftersales_settlement   las
+        from logpm_aftersales_settlement  las
         <where>
             las.processing_status = '4' and las.is_deleted = 0
             <if test="param.businessId != null"> and las.business_id LIKE CONCAT('%', #{param.businessId}, '%')</if>

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

@@ -103,7 +103,7 @@ public class AftersalesAppealServiceImpl extends BaseServiceImpl<AftersalesAppea
 		BeanUtil.copyProperties(aftersalesAppeal,aftersalesAppealEntity);
 		if(ObjectUtils.isNotNull( aftersalesAppeal.getId())){
 			//修改
-			if(ObjectUtils.isNotNull( aftersalesAppeal.getPeopleEntityList()) ){
+			if(ObjectUtils.isNotNull( aftersalesAppeal.getPeopleEntityList())){
 				//修改实际责任人
 				List<AftersalesAppealPeopleEntity> list = aftersalesAppealPeopleService.list(Wrappers.<AftersalesAppealPeopleEntity>query().lambda()
 					.eq(AftersalesAppealPeopleEntity::getWorkOrderId, aftersalesAppeal.getWorkOrderId())

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

@@ -45,6 +45,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -150,9 +151,11 @@ public class AftersalesProcessingResultsServiceImpl extends BaseServiceImpl<Afte
 		List<AftersalesProcessingMoneyVO> processingMoneyEntityList = new ArrayList<>();
 
 		list.forEach( i ->{
+			BigDecimal bigDecimal = i.getMoney().setScale(2);
 			String value = DictBizCache.getValue(DictBizConstant.RESULT_HANDLING, i.getResultType());
 			AftersalesProcessingMoneyVO processingMoneyVO = new AftersalesProcessingMoneyVO();
 			BeanUtil.copyProperties(i,processingMoneyVO);
+			processingMoneyVO.setMoney(bigDecimal);
 			processingMoneyVO.setResultTypeName(value);
 			processingMoneyEntityList.add(processingMoneyVO);
 		});

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

@@ -713,6 +713,9 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 						} else if (ObjectUtils.isNotNull(workOrderStatus) && WorkOrderStatusConstant.daichuli.getValue().equals(workOrderStatus)) {
 							aftersalesWorkOrder.remove("workOrderStatus");
 							aftersalesWorkOrder.put("customerServiceState", "80");  //55的待审核
+						}else if (ObjectUtils.isNotNull(workOrderStatus) && WorkOrderStatusConstant.yichuli.getValue().equals(workOrderStatus)) {
+							aftersalesWorkOrder.remove("workOrderStatus");
+							aftersalesWorkOrder.put("customerServiceState", "60");  //55的待审核
 						} else if (ObjectUtils.isNotNull(workOrderStatus) && WorkOrderStatusConstant.yiwanjei.getValue().equals(workOrderStatus)) {
 							aftersalesWorkOrder.remove("workOrderStatus");
 							aftersalesWorkOrder.put("customerServiceState", "10");
@@ -1102,7 +1105,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 	 * @return
 	 */
 	@Override
-	public AftersalesWorkOrderVO getProcessingResults(AftersalesWorkOrderDTO aftersalesWorkOrder) {
+	public AftersalesWorkOrderVO  getProcessingResults(AftersalesWorkOrderDTO aftersalesWorkOrder) {
 		AftersalesWorkOrderVO aftersalesWorkOrderVO = new AftersalesWorkOrderVO();
 
 		AftersalesWorkOrderEntity workOrderEntity = baseMapper.selectById(aftersalesWorkOrder.getId());
@@ -1216,12 +1219,17 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 			List<AftersalesCompletionRecordEntity> list4 = completionRecordService.list(Wrappers.<AftersalesCompletionRecordEntity>query().lambda()
 				.eq(AftersalesCompletionRecordEntity::getWorkOrderId, aftersalesWorkOrder.getId())
 			);
+			if (Func.isNotEmpty(list4)){
+				list4.forEach(i->{
+					BigDecimal bigDecimal = i.getMoney().setScale(2, BigDecimal.ROUND_FLOOR);
+					i.setMoney(bigDecimal);
+				});
+			}
 			aftersalesWorkOrderVO.setCompletionRecordEntities(list4);
 			List<AftersalesCompletionRecipientEntity> list5 = completionRecipientService.list(Wrappers.<AftersalesCompletionRecipientEntity>query().lambda()
 				.eq(AftersalesCompletionRecipientEntity::getWorkOrderId, aftersalesWorkOrder.getId())
 			);
 			aftersalesWorkOrderVO.setCompletionRecipientEntityList(list5);
-
 		}
 
 		return aftersalesWorkOrderVO;

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java

@@ -294,4 +294,9 @@ public class DistributionParcelListClient implements IDistributionParcelListClie
 	public List<DistributionParcelListEntity> findByWaybillNumber(String waybillNumber) {
 		return distributionParcelListService.findByWaybillNumber(waybillNumber);
 	}
+
+	@Override
+	public List<DistributionParcelListEntity> findEntityListByOrderCodeAndStatus(String orderCode, Long warehouseId, String packageStatus) {
+		return distributionParcelListService.findEntityListByOrderCodeAndStatus(orderCode,warehouseId,packageStatus);
+	}
 }

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

@@ -29,6 +29,7 @@ import com.logpm.distribution.vo.DistributionStockArticleVO;
 import com.logpm.distribution.vo.DistributionStockListVO;
 import com.logpm.distribution.vo.app.DistributionAppReservationVO;
 import com.logpm.distribution.vo.app.DistributionAppStockArticleVO;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -40,6 +41,7 @@ import java.util.Map;
  * @author TJJ
  * @since 2023-06-16
  */
+@Mapper
 public interface DistributionDeliveryInfoMapper extends BaseMapper<DistributionDeliveryInfoEntity> {
 
 	/**

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

@@ -193,4 +193,7 @@ public interface IDistributionParcelListService extends BaseService<Distribution
 	 * @return
 	 */
 	R searchNode(String packageCode);
+
+    List<DistributionParcelListEntity> findEntityListByOrderCodeAndStatus(String orderCode, Long warehouseId, String packageStatus);
+
 }

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

@@ -25,7 +25,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.logpm.aftersales.vo.AftersalesAbnormalPackageVO;
 import com.logpm.basic.entity.BasicPrintTemplateEntity;
 import com.logpm.basic.feign.IBasicPrintTemplateClient;
@@ -73,7 +72,6 @@ import org.springblade.common.constant.order.OrderStatusConstant;
 import org.springblade.common.constant.orderpackage.*;
 import org.springblade.common.constant.printTemplate.PrintTemplateStatusConstant;
 import org.springblade.common.constant.reservation.*;
-import org.springblade.common.constant.signing.SignforDriverSigningStatusConstant;
 import org.springblade.common.constant.signing.SignforStatusConstant;
 import org.springblade.common.constant.stockup.StockAssignStatusConstant;
 import org.springblade.common.constant.stockup.StockupStatusConstant;
@@ -6157,6 +6155,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			Long deliveryListEntityId = deliveryListEntity.getId();
 			String taskTime = deliveryListEntity.getTaskTime();//配送时间
 			String kind = deliveryListEntity.getKind();
+			String trainNumber = deliveryListEntity.getTrainNumber();
 			Map<String, String> driverCar = getDriverCar(kind, deliveryListEntityId);
 			String dirverName = driverCar.get("dirverName");
 			String dirverPhone = driverCar.get("dirverPhone");
@@ -6168,9 +6167,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			for (DistributionReservationEntity reservationEntity : distributionReservationEntityList) {
 				Map<String, Object> map = new HashMap<>();
 				map.put("配送单号", reservationEntity.getReservationCode());
+				map.put("车次号", trainNumber);
 				String fileTypeName = QRCodeUtil.createCodeToFile(reservationEntity.getReservationCode());
 				map.put("配送单二维码", QRCodeUtil.getEmpAutograph(fileTypeName));
-				map.put("收货单单位", reservationEntity.getReceivingUnit());//收货单单位
+				map.put("收货单位", reservationEntity.getReceivingUnit());//收货单单位
 				map.put("商城名称", reservationEntity.getStoreName());//商场名称
 				map.put("收货人", reservationEntity.getConsignee());//收货人
 				map.put("联系电话", reservationEntity.getDeliveryPhone());//收货人电话

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

@@ -34,7 +34,6 @@ import com.logpm.distribution.dto.app.StockupDTO;
 import com.logpm.distribution.entity.*;
 import com.logpm.distribution.excel.DistributionParcelListExcel;
 import com.logpm.distribution.mapper.DistributionParcelListMapper;
-import com.logpm.distribution.mapper.DistributionParcelNumberMapper;
 import com.logpm.distribution.mapper.DistributionStockArticleMapper;
 import com.logpm.distribution.service.*;
 import com.logpm.distribution.vo.*;
@@ -1020,4 +1019,15 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 		return R.data(listNodeVOS);
 	}
 
+	@Override
+	public List<DistributionParcelListEntity> findEntityListByOrderCodeAndStatus(String orderCode, Long warehouseId, String packageStatus) {
+		QueryWrapper<DistributionParcelListEntity> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("order_code",orderCode)
+			.eq("warehouse_id",warehouseId)
+			.eq("order_package_status",packageStatus)
+			.eq("is_transfer",1)
+			.eq("is_deleted",0);
+		return baseMapper.selectList(queryWrapper);
+	}
+
 }

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

@@ -1162,6 +1162,8 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		Map<String, Object> map = new HashMap<>();
 		//统计包件数量
 		AtomicInteger packageNum = new AtomicInteger();
+		//统计库存品数量
+		AtomicInteger inventoryNum = new AtomicInteger();
 		//预约订单数量
 		AtomicInteger orderNum = new AtomicInteger();
 		//库存品编号
@@ -1243,6 +1245,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 			orderNum.getAndAdd(orderCount);
 			//统计包件数量
 			packageNum.getAndAdd(reservationEntity.getReservationNum());
+			inventoryNum.getAndAdd(reservationEntity.getReservationStockListNum());
 			//TODO 设置是否齐套
 			this.updateById(reservationEntity);
 			//订单自编号拼接
@@ -1401,6 +1404,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 //		distributionDeliveryListEntity.setReservationId(reservationIds);
 
 		distributionDeliveryListEntity.setDeliveryNumber(packageNum.get());
+		distributionDeliveryListEntity.setInventoryNub(inventoryNum.get());
 		distributionDeliveryListService.updateById(distributionDeliveryListEntity);
 		return R.status(true);
 	}

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/api/ClassifyApi.java

@@ -12,9 +12,12 @@ import com.logpm.supervise.wrapper.ClassifyWrapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -24,6 +27,7 @@ import java.util.Map;
 @AllArgsConstructor
 @RequestMapping("/classifyApi")
 @Api(value = "分类指标表", tags = "分类指标表接口")
+@Slf4j
 public class ClassifyApi {
 
 	private final IClassifyService classifyService;
@@ -33,8 +37,26 @@ public class ClassifyApi {
 	@GetMapping("/classifyList")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "小程序指标项列表", notes = "传入classify")
-	public R<List<ClassifyApiVO>> classifyList() {
-		List<ClassifyApiVO> detail = classifyService.selectClassifyList();
+	public R<List<ClassifyApiVO>> classifyList(@RequestParam String deptId) {
+		String method = "##############classifyList";
+		if (Func.isEmpty(deptId)){
+			log.error(method+"部门id不能为空");
+			return null;
+		}
+		String dept = AuthUtil.getUser().getDeptId();
+//		if (!("0").equals(dept)){
+//			if (!deptId.contains(dept)){
+//				log.error(method+"当前登录人无法对选择部门进行考核");
+//				return R.fail("此账号无法对该部门进行考核");
+//			}
+//		}
+		List<Long> list = Func.toLongList(deptId);
+		int indexOf = list.indexOf(Long.parseLong(dept));
+		if (list.size() - 1 == indexOf){
+			//当前登录账号处于组织结构树最后一级就只能进行最后一级的指标项搜索
+			list.remove(indexOf);
+		}
+		List<ClassifyApiVO> detail = classifyService.selectClassifyList(deptId);
 		return R.data(detail);
 	}
 
@@ -44,7 +66,7 @@ public class ClassifyApi {
 	@PostMapping("/saveApiIndicators")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "小程序保存考核内容", notes = "传入classify")
-	public R saveApiIndicators(@RequestBody IndicatorsDTO instanceofDTO) {
+	public  R saveApiIndicators(@RequestBody IndicatorsDTO instanceofDTO) {
 		R r = classifyService.saveApiIndicators(instanceofDTO);
 		return r;
 	}
@@ -62,15 +84,15 @@ public class ClassifyApi {
 	@GetMapping("/myApiIndicatorsDetail")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "我的考核列表")
-	public R myApiIndicatorsDetail(@RequestParam Long id) {
-		R r = classifyService.myApiIndicatorsDetail(id);
+	public R myApiIndicatorsDetail(@RequestParam Long id,@RequestParam Long classifyId) {
+		R r = classifyService.myApiIndicatorsDetail(id,classifyId);
 		return r;
 	}
 
 
 	@PostMapping("/updateApiIndicators")
 	@ApiOperationSupport(order = 1)
-	@ApiOperation(value = "小程序保存考核内容", notes = "传入classify")
+	@ApiOperation(value = "修改考核列表", notes = "传入classify")
 	public R updateApiIndicators(@RequestBody IndicatorsDTO instanceofDTO) {
 		R r = classifyService.updateApiIndicators(instanceofDTO);
 		return r;
@@ -85,6 +107,13 @@ public class ClassifyApi {
 		return r;
 	}
 
+	@GetMapping("/cancelMyApiIndicators")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "我被考核的列表")
+	public R cancelMyApiIndicators(@RequestParam Long id) {
+		return R.status(classifyService.removeById(id));
+	}
+
 	@GetMapping("/deptList")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "我被考核的列表")
@@ -92,5 +121,4 @@ public class ClassifyApi {
 		R r = classifyService.deptList();
 		return r;
 	}
-
 }

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/controller/ClassifyController.java

@@ -35,6 +35,7 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 import springfox.documentation.annotations.ApiIgnore;
 
 import javax.validation.Valid;
@@ -247,6 +248,24 @@ public class ClassifyController extends BladeController {
 		}
 	}
 
+	@PostMapping("/importClassify")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "导入考核指标", notes = "传入indicatorsDTO")
+	public R importClassify(@RequestParam(value = "file") MultipartFile file) {
+		String method = "##############selectPointList: ";
+		log.info(method+"导入考核指标");
+
+		try{
+			return classifyService.importClassify(file);
+		}catch (CustomerException e){
+			log.error(e.message,e);
+			return R.fail(e.code,e.message);
+		}catch (Exception e){
+			log.error(method+"系统异常",e);
+			return R.fail(500,"系统异常");
+		}
+	}
+
 
 
 }

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/controller/IndicatorsController.java

@@ -3,17 +3,22 @@ package com.logpm.supervise.controller;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.logpm.supervise.dto.IndicatorsDTO;
 import com.logpm.supervise.service.IIndicatorsService;
+import com.logpm.supervise.vo.ExportIndicatorsVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 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.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 import java.util.Objects;
 
 @Slf4j
@@ -117,4 +122,17 @@ public class IndicatorsController {
 		}
 	}
 
+	@PostMapping("/exportIndicatorsList")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "导出考核", notes = "传入indicatorsDTO")
+	public void exportIndicatorsList(@RequestBody IndicatorsDTO indicatorsDTO, HttpServletResponse response) {
+		String method = "##############exportIndicatorsList: ";
+		log.info(method+"更新指标 参数={}",indicatorsDTO);
+
+		List<ExportIndicatorsVO> exportIndicatorsVOS = indicatorsService.exportIndicatorsList(indicatorsDTO);
+
+		ExcelUtil.export(response,"考核积分列表" + DateUtil.time(),"考核积分列表",exportIndicatorsVOS,ExportIndicatorsVO.class);
+	}
+
+
 }

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/ClassifyMapper.java

@@ -26,5 +26,5 @@ public interface ClassifyMapper extends BaseMapper<ClassifyEntity> {
 	 * @param pid
 	 * @return
 	 */
-	List<ClassifyApiVO> selectAllClassifyList(Long pid);
+	List<ClassifyApiVO> selectAllClassifyList(@Param("pid") Long pid,@Param("list")List<Long> list);
 }

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/ClassifyMapper.xml

@@ -35,7 +35,13 @@
                 and p_id = #{param.pId}
             </if>
             <if test="param.name != null and param.name != ''">
-                and `name` like #{param.name}
+                and `name` like concat('%',#{param.name},'%')
+            </if>
+            <if test="param.createDept != null ">
+                and create_dept = #{param.createDept}
+            </if>
+            <if test="param.examineDeptName != null and param.examineDeptName != ''">
+                and examine_dept_name = #{param.examineDeptName}
             </if>
         </where>
         order by create_time desc
@@ -62,5 +68,11 @@
         <if test="pid != null and pid != 0">
             and p_id = #{pid}
         </if>
+        <if test="list != null and list != ''">
+            and examine_dept_id in
+            <foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
     </select>
 </mapper>

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.java

@@ -5,11 +5,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.logpm.supervise.dto.IndicatorsDTO;
 import com.logpm.supervise.entity.IndicatorsEntity;
+import com.logpm.supervise.vo.ExportIndicatorsVO;
 import com.logpm.supervise.vo.IndicatorsVO;
 import com.logpm.supervise.vo.api.BeIndicatorsVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
 import java.util.Map;
 
 @Mapper
@@ -42,4 +44,6 @@ public interface IndicatorsMapper extends BaseMapper<IndicatorsEntity> {
 	 * @return
 	 */
 	BeIndicatorsVO selectMyPoints(@Param("params")Map<String, Object> params);
+
+	List<ExportIndicatorsVO> selectExportList(@Param("param") IndicatorsDTO indicatorsDTO);
 }

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml

@@ -7,16 +7,21 @@
         select si.id id,
                sc.id classifyId,
                sc.name classifyName,
+               sc.examine_dept_name examineDeptName,
                psc.id parentClassifyId,
                psc.name parentClassifyName,
-               psc.id parentClassifyId,
                si.assess_dept_name assessDeptName,
                si.assess_user_name assessUserName,
+               si.assess_user_id assessUserId,
                si.point point,
                si.remark remark,
+               si.appeal_reason appealReason,
                si.indicators_status indicatorsStatus,
                si.is_objection isObjection,
-               si.objection_remark objectionRemark
+               si.objection_remark objectionRemark,
+               si.create_time createTime,
+               si.create_dept createDept,
+               si.create_user createUser
         from sup_indicators si
         left join sup_classify sc on sc.id = si.classify_id
         left join sup_classify psc on psc.id = sc.p_id
@@ -34,6 +39,9 @@
         <if test="param.end != null">
             and si.create_time &lt;= #{param.end}
         </if>
+        <if test="param.createDept != null">
+            and si.create_dept = #{param.createDept}
+        </if>
 
     </select>
 
@@ -49,7 +57,13 @@
           and si.id = #{id}
     </select>
     <select id="selectMyApiIndicators" resultType="com.logpm.supervise.vo.IndicatorsVO">
-        SELECT si.*,sc.name AS classifyName FROM sup_indicators AS  si LEFT JOIN sup_classify AS sc ON si.classify_id = sc.id
+        SELECT si.*,sc.name AS classifyName ,
+        case indicators_status
+        WHEN 1 then '已提交'
+        WHEN 2 then '已确认'
+        END AS indicatorsStatusName
+        FROM sup_indicators AS  si
+        LEFT JOIN sup_classify AS sc ON si.classify_id = sc.id
          WHERE si.is_deleted = 0 and si.create_user = #{params.userId} AND sc.is_deleted = 0
         <if test="params.assessDept != null and params.assessDept != ''" >
             and si.assess_dept = #{params.assessDept}
@@ -64,7 +78,11 @@
     <select id="selectBeMyApiIndicators" resultType="com.logpm.supervise.vo.IndicatorsVO">
         SELECT
         si.*,
-        sc.NAME AS classifyName
+        sc.NAME AS classifyName,
+        case indicators_status
+        WHEN 1 then '已提交'
+        WHEN 2 then '已确认'
+        END AS indicatorsStatusName
         FROM
         sup_indicators AS si
         LEFT JOIN sup_classify AS sc ON si.classify_id = sc.id AND sc.is_deleted = 0
@@ -82,9 +100,50 @@
         sum(case  when point < 0 then point else 0 end) as deductionPoints ,
         sum(case  when point > 0 then point else 0 end) as bonusPoins
         from sup_indicators
-        where assess_dept = #{params.deptId}
+        where assess_dept = #{params.deptId} AND is_deleted = 0
         and DATE_FORMAT(create_time, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m')
         ]]>
     </select>
 
+
+    <select id="selectExportList" resultType="com.logpm.supervise.vo.ExportIndicatorsVO">
+        select si.create_dept createDept,
+        sc.name classifyName,
+        sc.description classifyDesc,
+        si.remark indicatorsRemark,
+        sc.examine_dept_id examineDeptId,
+        sc.examine_dept_name examineDeptName,
+        psc.name parentClassifyName,
+        psc.description parentClassifyDesc,
+        psc.remark parentClassifyRemark,
+        si.assess_dept_name assessDeptName,
+        si.assess_user_name assessUserName,
+        si.point point,
+        si.create_time createTime,
+        si.create_user createUser,
+        si.objection_remark objectionRemark,
+        si.appeal_reason appealReason
+        from sup_indicators si
+        left join sup_classify sc on sc.id = si.classify_id
+        left join sup_classify psc on psc.id = sc.p_id
+        where 1=1
+        and si.is_deleted = 0
+        <if test="param.assessDept != null">
+            and si.assess_dept = #{param.assessDept}
+        </if>
+        <if test="param.parentClassifyId != null">
+            and psc.id = #{param.parentClassifyId}
+        </if>
+        <if test="param.start != null">
+            and si.create_time &gt;= #{param.start}
+        </if>
+        <if test="param.end != null">
+            and si.create_time &lt;= #{param.end}
+        </if>
+        <if test="param.createDept != null">
+            and si.create_dept = #{param.createDept}
+        </if>
+    </select>
+
+
 </mapper>

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/IClassifyService.java

@@ -25,7 +25,9 @@ import com.logpm.supervise.vo.IndicatorsVO;
 import com.logpm.supervise.vo.api.ClassifyApiVO;
 import org.springblade.core.mp.base.BaseService;
 import org.springblade.core.tool.api.R;
+import org.springframework.web.multipart.MultipartFile;
 
+import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 
@@ -56,7 +58,7 @@ public interface IClassifyService extends BaseService<ClassifyEntity> {
 	 * 查询指标项列表
 	 * @return
 	 */
-	List<ClassifyApiVO> selectClassifyList();
+	List<ClassifyApiVO> selectClassifyList(String deptId);
 
 	/**
 	 * API保存考核信息
@@ -77,7 +79,7 @@ public interface IClassifyService extends BaseService<ClassifyEntity> {
 	 * @param id
 	 * @return
 	 */
-	R myApiIndicatorsDetail(Long id);
+	R myApiIndicatorsDetail(Long id,Long classifyId);
 
 	/**
 	 * 修改我的考核
@@ -100,4 +102,6 @@ public interface IClassifyService extends BaseService<ClassifyEntity> {
 	 */
 	R deptList();
 
+    R importClassify(MultipartFile file) throws IOException;
+
 }

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/IIndicatorsService.java

@@ -2,9 +2,12 @@ package com.logpm.supervise.service;
 
 import com.logpm.supervise.dto.IndicatorsDTO;
 import com.logpm.supervise.entity.IndicatorsEntity;
+import com.logpm.supervise.vo.ExportIndicatorsVO;
 import org.springblade.core.mp.base.BaseService;
 import org.springblade.core.tool.api.R;
 
+import java.util.List;
+
 public interface IIndicatorsService extends BaseService<IndicatorsEntity> {
 	R findIndicatorsList(IndicatorsDTO indicatorsDTO);
 
@@ -13,4 +16,7 @@ public interface IIndicatorsService extends BaseService<IndicatorsEntity> {
 	R updateIndicators(IndicatorsDTO indicatorsDTO);
 
     void deleteById(Long id);
+
+	List<ExportIndicatorsVO> exportIndicatorsList(IndicatorsDTO indicatorsDTO);
+
 }

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java

@@ -16,11 +16,14 @@
  */
 package com.logpm.supervise.service.impl;
 
+import com.alibaba.excel.EasyExcel;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.logpm.supervise.dto.ClassifyDTO;
+import com.logpm.supervise.dto.ImportClassifyDTO;
 import com.logpm.supervise.dto.IndicatorsDTO;
 import com.logpm.supervise.entity.ClassifyEntity;
 import com.logpm.supervise.entity.IndicatorsAnnexEntity;
@@ -42,6 +45,8 @@ import com.logpm.supervise.wrapper.IndicatorsWrapper;
 import com.logpm.supervise.wrapper.PointsWrapper;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springblade.common.constant.common.IsOrNoConstant;
+import org.springblade.common.exception.CustomerException;
 import org.springblade.common.utils.CommonUtil;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.secure.BladeUser;
@@ -58,7 +63,10 @@ import org.springblade.system.feign.ISysClient;
 import org.springblade.system.feign.IUserClient;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
 
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -95,19 +103,40 @@ public class ClassifyServiceImpl extends BaseServiceImpl<ClassifyMapper, Classif
 		String pId = (String) classify.get("pid");
 		String name = (String) classify.get("name");
 		String isPid = (String) classify.get("isPid");
+		String createDeptName = (String) classify.get("createDeptName");
+		String examineDeptName = (String) classify.get("examineDeptName");
 
 		ClassifyDTO classifyDTO = new ClassifyDTO();
 		if (StringUtil.isNotBlank(pId)) {
 			classifyDTO.setPId(Long.parseLong(pId));
 		}
+
+		Long createDept = deptClient.findIdByName(createDeptName);
+
 		classifyDTO.setName(name);
 		classifyDTO.setIsPid(Integer.parseInt(isPid));
+		classifyDTO.setCreateDept(createDept);
+		classifyDTO.setExamineDeptName(examineDeptName);
 
 		IPage<ClassifyVO> pages = baseMapper.pageList(page, classifyDTO);
 		List<ClassifyVO> records = pages.getRecords();
 
-		if (!"1".equals(isPid)) {
-			for (ClassifyVO record : records) {
+		String loginDeptId = AuthUtil.getDeptId();
+
+		for (ClassifyVO record : records) {
+			Long deptId = record.getCreateDept();
+			String deptName = deptClient.findNameById(deptId);
+			record.setCreateDeptName(deptName);
+
+			String ancestors = deptClient.getAncestorsByDeptId(deptId);
+			boolean contains = ancestors.contains(loginDeptId);
+			if(contains){
+				record.setIsEdit(1);
+			}else{
+				record.setIsEdit(0);
+			}
+
+			if (!"1".equals(isPid)) {
 				Long classifyId = record.getId();
 				Long pId1 = record.getPId();
 				ClassifyEntity classifyEntity = getById(pId1);
@@ -174,6 +203,8 @@ public class ClassifyServiceImpl extends BaseServiceImpl<ClassifyMapper, Classif
 		classifyEntity.setDescription(classifyDTO.getDescription());
 		classifyEntity.setRemark(classifyDTO.getRemark());
 		classifyEntity.setPId(classifyDTO.getPId());
+		classifyEntity.setExamineDeptId(classifyDTO.getExamineDeptId());
+		classifyEntity.setExamineDeptName(classifyDTO.getExamineDeptName());
 		updateById(classifyEntity);
 
 		//先删除所有积分
@@ -211,19 +242,37 @@ public class ClassifyServiceImpl extends BaseServiceImpl<ClassifyMapper, Classif
 	}
 
 	@Override
-	public List<ClassifyApiVO> selectClassifyList() {
+	public List<ClassifyApiVO> selectClassifyList(String deptId) {
 		Long pid = 0L;
-		List<ClassifyApiVO> classifyEntities = getClassifyList(pid);
+		List<Long> listId = new ArrayList<>();
+		List<ClassifyApiVO> classifyEntities = getClassifyList(pid,null);
 		for (ClassifyApiVO classifyEntity : classifyEntities) {
 			if (classifyEntity.getPId().equals(0L)) {
 				List<ClassifyApiVO> classifyList = new ArrayList<>();
-				List<ClassifyEntity> entityList = this.list(Wrappers.<ClassifyEntity>query().lambda()
+				LambdaQueryWrapper<ClassifyEntity> ne = Wrappers.<ClassifyEntity>query().lambda()
 					.eq(ClassifyEntity::getPId, classifyEntity.getId())
-					.ne(ClassifyEntity::getPId, 0L)
+					.ne(ClassifyEntity::getPId, 0L);
+				if (Func.isNotBlank(deptId)){
+					ne.in(ClassifyEntity::getExamineDeptId,  Func.toLongList(deptId));
+					//查询是否已经提交过考核
+					listId = Func.toLongList(deptId);
+				}
+				List<ClassifyEntity> entityList = this.list(ne
 				);
 				for (ClassifyEntity entity : entityList) {
 					ClassifyVO classifyVO = ClassifyWrapper.build().entityVO(entity);
 					ClassifyApiVO classifyApiVO = Func.copy(classifyVO, ClassifyApiVO.class);
+					classifyApiVO.setIsCommit(0);
+					if (Func.isNotEmpty(listId)){
+						Long l = listId.get(listId.size()- 1);
+						List<IndicatorsEntity> indicatorsEntityList = iIndicatorsService.list(Wrappers.<IndicatorsEntity>query().lambda()
+							.eq(IndicatorsEntity::getAssessDept, l)
+							.eq(IndicatorsEntity::getClassifyId, entity.getId())
+						);
+						if (Func.isNotEmpty(indicatorsEntityList) && indicatorsEntityList.size()>= 1){
+							classifyApiVO.setIsCommit(1);
+						}
+					}
 					List<PointsEntity> list = pointsService.list(Wrappers.<PointsEntity>query().lambda()
 						.eq(PointsEntity::getClassifyId, entity.getId())
 					);
@@ -233,10 +282,13 @@ public class ClassifyServiceImpl extends BaseServiceImpl<ClassifyMapper, Classif
 					}
 					classifyList.add(classifyApiVO);
 				}
-				classifyEntity.setChildren(classifyList);
+				if (Func.isNotEmpty(classifyList)){
+					classifyEntity.setChildren(classifyList);
+				}
 			}
 		}
-		return classifyEntities;
+		List<ClassifyApiVO> collect = classifyEntities.stream().filter(f -> Func.isNotEmpty(f.getChildren())).collect(Collectors.toList());
+		return collect;
 	}
 
 	@Override
@@ -320,7 +372,7 @@ public class ClassifyServiceImpl extends BaseServiceImpl<ClassifyMapper, Classif
 	}
 
 	@Override
-	public R myApiIndicatorsDetail(Long id) {
+	public R myApiIndicatorsDetail(Long id,Long classifyId) {
 		IndicatorsEntity indicatorsEntity = iIndicatorsService.getById(id);
 		//查询是否存在有附件
 		List<IndicatorsAnnexEntity> list = indicatorsAnnexService.list(Wrappers.<IndicatorsAnnexEntity>query().lambda().eq(IndicatorsAnnexEntity::getIndicatorsId, id));
@@ -329,6 +381,39 @@ public class ClassifyServiceImpl extends BaseServiceImpl<ClassifyMapper, Classif
 		if (Func.isNotEmpty(userR)) {
 			indicatorsVO.setCreatedUserName(userR.getData().getName());
 		}
+		if (Func.isEmpty(classifyId)){
+			log.error("myApiIndicatorsDetail##########参数缺失,classifyId");
+			return R.fail("请联系管理员");
+		}
+		//处理指标项
+		ClassifyEntity byId = this.getById(classifyId);
+		if (Func.isNotEmpty(indicatorsVO)){
+//			Long classifyId = indicatorsVO.getClassifyId();
+			if (Func.isNotEmpty(byId)){
+				indicatorsVO.setClassifyId(byId.getId());
+				indicatorsVO.setClassifyName(byId.getName());
+				indicatorsVO.setDeduction(byId.getDescription());
+				List<PointsEntity> pointsEntities = pointsService.list(Wrappers.<PointsEntity>query().lambda()
+					.eq(PointsEntity::getClassifyId, byId.getId())
+				);
+				if (Func.isNotEmpty(pointsEntities)) {
+					assert pointsEntities != null;
+					indicatorsVO.setPointsVOS(PointsWrapper.build().listVO(pointsEntities));
+				}
+				ClassifyEntity penantClassifyEntity = this.getOne(Wrappers.<ClassifyEntity>query().lambda().eq(ClassifyEntity::getId, byId.getPId()));
+				if (Func.isNotEmpty(penantClassifyEntity)){
+					indicatorsVO.setParentClassifyId(penantClassifyEntity.getId());
+					indicatorsVO.setParentClassifyName(penantClassifyEntity.getName());
+				}
+			}
+		}else {
+			log.info("###########查询考核指标项classifyId:{}",classifyId);
+			indicatorsVO = new IndicatorsVO();
+			indicatorsVO.setClassifyId(byId.getId());
+			indicatorsVO.setClassifyName(byId.getName());
+			indicatorsVO.setDeduction(byId.getDescription());
+
+		}
 		if (Func.isNotEmpty(list)) {
 			Map<Integer, List<IndicatorsAnnexEntity>> resourceMap = list.stream().filter(item -> !Objects.isNull(item.getType())).collect(Collectors.groupingBy(IndicatorsAnnexEntity::getType));
 			if (Func.isNotEmpty(resourceMap.get(1))) {
@@ -356,6 +441,17 @@ public class ClassifyServiceImpl extends BaseServiceImpl<ClassifyMapper, Classif
 			handleResource(instanceofDTO.getResourceList(), instanceofDTO.getId());
 		}
 		IndicatorsEntity indicatorsEntity = Func.copy(instanceofDTO, IndicatorsEntity.class);
+		if (2 == indicatorsEntity.getIndicatorsStatus()){
+			return R.fail("已确认考核无法进行修改");
+		}
+		if (Func.isNotEmpty(instanceofDTO.getAppealReason())){
+			indicatorsEntity.setIsObjection(1);
+		}
+		if (Func.isNotEmpty(instanceofDTO.getIsCommit())){
+			if (1 == instanceofDTO.getIsCommit()){
+				indicatorsEntity.setIndicatorsStatus(2);
+			}
+		}
 		return R.status(iIndicatorsService.updateById(indicatorsEntity));
 	}
 
@@ -406,11 +502,101 @@ public class ClassifyServiceImpl extends BaseServiceImpl<ClassifyMapper, Classif
 	@Override
 	public R deptList() {
 		BladeUser user = AuthUtil.getUser();
+//		List<DeptVO> deptTree = deptClient.getDeptTree(user.getTenantId());
 		List<Dept> userDeptNode = deptClient.getUserDeptNode(Long.parseLong(user.getDeptId()));
 		return R.data(userDeptNode);
 	}
 
-	private List<ClassifyApiVO> getClassifyList(Long pid) {
-		return baseMapper.selectAllClassifyList(pid);
+	@Transactional(rollbackFor = Exception.class)
+	@Override
+	public R importClassify(MultipartFile file) throws IOException {
+		if(Objects.isNull(file)){
+			log.warn("##################importClassify: 文件不存在");
+			return R.fail(405,"文件不存在");
+		}
+		InputStream inputStream = file.getInputStream();
+
+		List<ImportClassifyDTO> importClassifyDTOS = EasyExcel.read(inputStream).head(ImportClassifyDTO.class).sheet(0).headRowNumber(1).doReadSync();
+
+		for (ImportClassifyDTO importClassifyDTO : importClassifyDTOS) {
+			String parentClassifyName = importClassifyDTO.getParentClassifyName();
+			String parentClassifyDesc = importClassifyDTO.getParentClassifyDesc();
+			String parentClassifyRemark = importClassifyDTO.getParentClassifyRemark();
+			String createDeptName = importClassifyDTO.getCreateDeptName();
+
+			Long createDeptId = deptClient.findIdByName(createDeptName);
+
+			//判断指标分类是否已经存在
+			QueryWrapper<ClassifyEntity> queryWrapper = new QueryWrapper<>();
+			queryWrapper.eq("name",parentClassifyName)
+				.eq("p_id",0)
+				.eq("is_deleted",0);
+			ClassifyEntity parnetClassifyEntity = baseMapper.selectOne(queryWrapper);
+			if(Objects.isNull(parnetClassifyEntity)){
+				parnetClassifyEntity = new ClassifyEntity();
+				parnetClassifyEntity.setName(parentClassifyName);
+				parnetClassifyEntity.setDescription(parentClassifyDesc);
+				parnetClassifyEntity.setRemark(parentClassifyRemark);
+				parnetClassifyEntity.setPId(0L);
+				parnetClassifyEntity.setCreateDept(createDeptId);
+			}else{
+				parnetClassifyEntity.setDescription(parentClassifyDesc);
+				parnetClassifyEntity.setRemark(parentClassifyRemark);
+			}
+			boolean pb = saveOrUpdate(parnetClassifyEntity);
+			if(!pb){
+				log.warn("#############importClassify: 保存指标分类失败");
+				throw new CustomerException(405,"保存指标分类失败");
+			}
+			parnetClassifyEntity.setCreateDept(createDeptId);
+			updateById(parnetClassifyEntity);
+
+			Long parentClassifyId = parnetClassifyEntity.getId();
+
+			String classifyName = importClassifyDTO.getClassifyName();
+			String classifyDesc = importClassifyDTO.getClassifyDesc();
+			String examineDeptName = importClassifyDTO.getExamineDeptName();
+			Long examineDeptId = deptClient.findIdByName(examineDeptName);
+
+			ClassifyEntity classifyEntity = new ClassifyEntity();
+			classifyEntity.setName(classifyName);
+			classifyEntity.setDescription(classifyDesc);
+			classifyEntity.setPId(parentClassifyId);
+			if(!Objects.isNull(examineDeptId)){
+				classifyEntity.setExamineDeptId(examineDeptId);
+				classifyEntity.setExamineDeptName(examineDeptName);
+			}
+			boolean b = save(classifyEntity);
+			if(!b){
+				log.warn("#############importClassify: 保存指标失败");
+				throw new CustomerException(405,"保存指标失败");
+			}
+			classifyEntity.setCreateDept(createDeptId);
+			updateById(classifyEntity);
+			Long classifyId = classifyEntity.getId();
+
+			String points = importClassifyDTO.getPoints();
+			points = points.replaceAll("，",",");
+			String[] pointArray = points.split(",");
+
+			List<PointsEntity> ls = new ArrayList<>();
+			for (String point : pointArray) {
+				PointsEntity pointsEntity = new PointsEntity();
+				pointsEntity.setClassifyId(classifyId);
+				pointsEntity.setPoint(Integer.parseInt(point));
+				ls.add(pointsEntity);
+			}
+			pointsService.saveBatch(ls);
+		}
+
+		return R.success("导入成功");
+	}
+
+	private List<ClassifyApiVO> getClassifyList(Long pid,String exAdminDeptId) {
+		List<Long> list = null;
+		if (Func.isNotEmpty(exAdminDeptId)){
+			list = Func.toLongList(exAdminDeptId);
+		}
+		return baseMapper.selectAllClassifyList(pid,list);
 	}
 }

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/IndicatorsServiceImpl.java

@@ -8,12 +8,18 @@ import com.logpm.supervise.entity.IndicatorsEntity;
 import com.logpm.supervise.mapper.IndicatorsMapper;
 import com.logpm.supervise.service.IIndicatorsAnnexService;
 import com.logpm.supervise.service.IIndicatorsService;
+import com.logpm.supervise.vo.ExportIndicatorsVO;
 import com.logpm.supervise.vo.IndicatorsVO;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springblade.common.exception.CustomerException;
 import org.springblade.common.utils.CommonUtil;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
+import org.springblade.system.entity.User;
+import org.springblade.system.feign.IDeptClient;
+import org.springblade.system.feign.IUserClient;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
@@ -27,6 +33,10 @@ public class IndicatorsServiceImpl extends BaseServiceImpl<IndicatorsMapper, Ind
 
 	private final IIndicatorsAnnexService iIndicatorsAnnexService;
 
+	private final IDeptClient deptClient;
+
+	private final IUserClient userClient;
+
 	@Override
 	public R findIndicatorsList(IndicatorsDTO indicatorsDTO) {
 
@@ -36,14 +46,55 @@ public class IndicatorsServiceImpl extends BaseServiceImpl<IndicatorsMapper, Ind
 
 		String startDateStr = indicatorsDTO.getStartDateStr();
 		String endDateStr = indicatorsDTO.getEndDateStr();
+		String createDeptName = indicatorsDTO.getCreateDeptName();
+
+		Long createDept = deptClient.findIdByName(createDeptName);
 
 		Date start = CommonUtil.getStartByDateStr(startDateStr);
 		Date end = CommonUtil.getEndByDateStr(endDateStr);
 		indicatorsDTO.setStart(start);
 		indicatorsDTO.setEnd(end);
+		indicatorsDTO.setCreateDept(createDept);
 
 		IPage<IndicatorsVO> pages = baseMapper.pageList(page,indicatorsDTO);
 
+		List<IndicatorsVO> records = pages.getRecords();
+
+		Long userId = AuthUtil.getUserId();
+
+		for (IndicatorsVO record : records) {
+			Long deptId = record.getCreateDept();
+			String deptName = deptClient.findNameById(deptId);
+			record.setCreateDeptName(deptName);
+			Long createUser = record.getCreateUser();
+			Long assessUserId = record.getAssessUserId();
+			Long assessDept = record.getAssessDept();
+			Integer indicatorsStatus = record.getIndicatorsStatus();
+			if(indicatorsStatus.equals(2)){
+				record.setIsEdit(0);
+			}else{
+				if(userId.equals(createUser)){
+					record.setIsEdit(1);
+				}else{
+					if(Objects.isNull(assessUserId)){
+						Long deptId1 = Long.parseLong(AuthUtil.getDeptId());
+						if(deptId1.equals(assessDept)){
+							record.setIsEdit(2);
+						}else{
+							record.setIsEdit(0);
+						}
+					}else{
+						if(assessUserId.equals(userId)){
+							record.setIsEdit(2);
+						}else{
+							record.setIsEdit(0);
+						}
+					}
+				}
+			}
+
+		}
+		pages.setRecords(records);
 
 		return R.data(pages);
 	}
@@ -73,6 +124,12 @@ public class IndicatorsServiceImpl extends BaseServiceImpl<IndicatorsMapper, Ind
 			return R.fail(405,"指标信息不存在");
 		}
 
+		Integer indicatorsStatus = indicatorsEntity.getIndicatorsStatus();
+		if(indicatorsStatus.equals(2)){
+			log.warn("############updateIndicators: 考核已确认，不能编辑");
+			return R.fail(405,"考核已确认，不能编辑");
+		}
+
 		indicatorsEntity.setAssessDept(indicatorsDTO.getAssessDept());
 		indicatorsEntity.setAssessDeptName(indicatorsDTO.getAssessDeptName());
 		indicatorsEntity.setAssessUserId(indicatorsDTO.getAssessUserId());
@@ -81,6 +138,7 @@ public class IndicatorsServiceImpl extends BaseServiceImpl<IndicatorsMapper, Ind
 		indicatorsEntity.setPoint(indicatorsDTO.getPoint());
 		indicatorsEntity.setRemark(indicatorsDTO.getRemark());
 		indicatorsEntity.setObjectionRemark(indicatorsDTO.getObjectionRemark());
+		indicatorsEntity.setAppealReason(indicatorsDTO.getAppealReason());
 
 		updateById(indicatorsEntity);
 		return R.success("更新成功");
@@ -89,8 +147,50 @@ public class IndicatorsServiceImpl extends BaseServiceImpl<IndicatorsMapper, Ind
 	@Override
 	public void deleteById(Long id) {
 
+		IndicatorsEntity indicatorsEntity = baseMapper.selectById(id);
+		if(Objects.isNull(indicatorsEntity)){
+			log.warn("############deleteById: 未找到考核信息");
+			throw new CustomerException(405,"未找到考核信息");
+		}
+
+		Integer indicatorsStatus = indicatorsEntity.getIndicatorsStatus();
+		if(indicatorsStatus.equals(2)){
+			log.warn("############deleteById: 考核已确认，不能删除");
+			throw new CustomerException(405,"考核已确认，不能删除");
+		}
+
 		baseMapper.deleteById(id);
 
 	}
 
+	@Override
+	public List<ExportIndicatorsVO> exportIndicatorsList(IndicatorsDTO indicatorsDTO) {
+
+		String startDateStr = indicatorsDTO.getStartDateStr();
+		String endDateStr = indicatorsDTO.getEndDateStr();
+		String createDeptName = indicatorsDTO.getCreateDeptName();
+
+		Long createDept = deptClient.findIdByName(createDeptName);
+
+		Date start = CommonUtil.getStartByDateStr(startDateStr);
+		Date end = CommonUtil.getEndByDateStr(endDateStr);
+		indicatorsDTO.setStart(start);
+		indicatorsDTO.setEnd(end);
+		indicatorsDTO.setCreateDept(createDept);
+
+		List<ExportIndicatorsVO> list = baseMapper.selectExportList(indicatorsDTO);
+
+		for (ExportIndicatorsVO exportIndicatorsVO : list) {
+			Long deptId = exportIndicatorsVO.getCreateDept();
+			String deptName = deptClient.findNameById(deptId);
+			exportIndicatorsVO.setCreateDeptName(deptName);
+			Long createUser = exportIndicatorsVO.getCreateUser();
+			R<User> userR = userClient.userInfoById(createUser);
+			String userName = userR.getData().getName();
+			exportIndicatorsVO.setCreateUserName(userName);
+		}
+
+		return list;
+	}
+
 }

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

@@ -7,7 +7,6 @@ import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
 import com.logpm.trunkline.dto.BillladingDTO;
 import com.logpm.trunkline.service.ITrunklineBillladingService;
 import com.logpm.trunkline.vo.TrunklineBillladingDetailListVO;
-import com.logpm.trunkline.vo.TrunklineBillladingDetailVO;
 import com.logpm.trunkline.vo.TrunklineBillladingVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -78,9 +77,11 @@ public class BillladingApiController {
 			}
 			billladingDTO.setWarehouseId(myCurrentWarehouse.getId());
 
-			IPage<TrunklineBillladingDetailVO> pages = billladingService.billladingList(billladingDTO);
+//			IPage<TrunklineBillladingDetailVO> pages = billladingService.billladingList(billladingDTO);
+//			return R.data(pages);
+
+			return billladingService.billladingList(billladingDTO);
 
-			return R.data(pages);
 		}catch (CustomerException e){
 			log.error(e.message,e);
 			return R.fail(e.code,e.message);

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

@@ -391,7 +391,7 @@ public class CarsLoadApiController {
 				return R.fail(405,"包件码不能为空");
 			}
 
-			return carsLoadService.loadingScan(loadId,myCurrentWarehouse.getId(),orderPackageCode,loadCarsDTO.getTrayCode());
+			return carsLoadService.loadingScan(loadId,myCurrentWarehouse.getId(),orderPackageCode,loadCarsDTO.getTrayCode(),"正常装车");
 		}catch (CustomerException e){
 			log.error(e.message,e);
 			return R.fail(e.code,e.message);

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

@@ -49,11 +49,12 @@ public class BillladingController {
 
 			//当前登录人选择的仓库
 			BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
-			if(!Objects.isNull(myCurrentWarehouse)){
-//				log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse);
-//				return R.fail(403,"仓库信息为空");
-				billladingDTO.setWarehouseId(myCurrentWarehouse.getId());
+			if(Objects.isNull(myCurrentWarehouse)){
+				log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse);
+				return R.fail(403,"仓库信息为空");
 			}
+			billladingDTO.setWarehouseId(myCurrentWarehouse.getId());
+
 			IPage<TrunklineBillladingVO> pages = trunklineBillladingService.pageList(billladingDTO);
 
 			return R.data(pages);

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

@@ -13,7 +13,6 @@ import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.exception.CustomerException;
-import org.springblade.core.redis.lock.RedisLock;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springframework.web.bind.annotation.*;
@@ -1905,4 +1904,37 @@ public class CarsLoadController {
 		}
 	}
 
+	@ResponseBody
+	@PostMapping("/manualLoading")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "手动装车", notes = "传入loadCarsDTO")
+	public R manualLoading(@RequestBody LoadCarsDTO loadCarsDTO) {
+		String method = "############manualLoading: ";
+		log.info(method + "请求参数{}", loadCarsDTO);
+		Long loadId = loadCarsDTO.getLoadId();
+
+		try{
+
+			//当前登录人选择的仓库
+			BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
+			if(Objects.isNull(myCurrentWarehouse)){
+				log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse);
+				return R.fail(405,"仓库信息为空");
+			}
+			loadCarsDTO.setWarehouseId(myCurrentWarehouse.getId());
+			if(Objects.isNull(loadId)){
+				log.warn(method+"配载id为空 loadId={}",loadId);
+				return R.fail(405,"配载id为空");
+			}
+
+			return carsLoadService.manualLoading(loadCarsDTO,"PC手动一键装车");
+		}catch (CustomerException e){
+			log.error(e.message,e);
+			return R.fail(e.code,e.message);
+		}catch (Exception e){
+			log.error(method+"系统异常",e);
+			return R.fail(500,"系统异常");
+		}
+	}
+
 }

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

@@ -377,12 +377,6 @@ public class TripartiteTransferController {
 				log.warn(method+"配载id为空 loadId={}",loadId);
 				return R.fail(400,"配载id为空");
 			}
-
-			if(Objects.isNull(assistantId)){
-				log.warn(method+"副驾id为空 assistantId={}",assistantId);
-				return R.fail(400,"副驾id为空");
-			}
-
 			if(Objects.isNull(driverId)){
 				log.warn(method+"司机id为空 driverId={}",driverId);
 				return R.fail(400,"司机id为空");
@@ -397,18 +391,10 @@ public class TripartiteTransferController {
 				return R.fail(400,"司机电话为空");
 			}
 
-			if(Objects.isNull(carId)){
-				log.warn(method+"车辆id为空 carId={}",carId);
-				return R.fail(400,"车辆id为空");
-			}
 			if(StringUtil.isBlank(chargeType)){
 				log.warn(method+"分摊方式为空 chargeType={}",chargeType);
 				return R.fail(400,"分摊方式为空");
 			}
-			if(StringUtil.isBlank(carNumber)){
-				log.warn(method+"车牌号为空 carNumber={}",carNumber);
-				return R.fail(400,"车牌号为空");
-			}
 
 			if(StringUtil.isBlank(loadType)){
 				log.warn(method+"配载类型为空 loadType={}",loadType);

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

@@ -24,34 +24,34 @@
             and lta.has_package = #{param.hasPackage}
         </if>
         <if test="param.orderCode != null and param.orderCode != ''">
-            and lta.order_code like concat('%',${param.orderCode},'%')
+            and lta.order_code like concat('%',#{param.orderCode},'%')
         </if>
         <if test="param.dealerName != null and param.dealerName != ''">
-            and lta.dealer_name like concat('%',${param.dealerName},'%')
+            and lta.dealer_name like concat('%',#{param.dealerName},'%')
         </if>
         <if test="param.storeName != null and param.storeName != ''">
-            and lta.store_name like concat('%',${param.storeName},'%')
+            and lta.store_name like concat('%',#{param.storeName},'%')
         </if>
         <if test="param.siteName != null and param.siteName != ''">
-            and lta.site_name like concat('%',${param.siteName},'%')
+            and lta.site_name like concat('%',#{param.siteName},'%')
         </if>
         <if test="param.trainNumber != null and param.trainNumber != ''">
-            and lta.train_number like concat('%',${param.trainNumber},'%')
+            and lta.train_number like concat('%',#{param.trainNumber},'%')
         </if>
         <if test="param.serviceNum != null and param.serviceNum != ''">
-            and lta.service_num like concat('%',${param.serviceNum},'%')
+            and lta.service_num like concat('%',#{param.serviceNum},'%')
         </if>
         <if test="param.brand != null and param.brand != ''">
-            and lta.brand like concat('%',${param.brand},'%')
+            and lta.brand like concat('%',#{param.brand},'%')
         </if>
         <if test="param.customerName != null and param.customerName != ''">
-            and lta.customer_name like concat('%',${param.customerName},'%')
+            and lta.customer_name like concat('%',#{param.customerName},'%')
         </if>
         <if test="param.customerPhone != null and param.customerPhone != ''">
-            and lta.customer_phone like concat('%',${param.customerPhone},'%')
+            and lta.customer_phone like concat('%',#{param.customerPhone},'%')
         </if>
         <if test="param.customerAddress != null and param.customerAddress != ''">
-            and lta.customer_address like concat('%',${param.customerAddress},'%')
+            and lta.customer_address like concat('%',#{param.customerAddress},'%')
         </if>
     </select>
 

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

@@ -12,7 +12,7 @@ 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
 public interface TrunklineBillladingMapper extends BaseMapper<TrunklineBillladingEntity> {
@@ -21,9 +21,11 @@ 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);
 
 	IPage<TrunklineBillladingDetailListVO> findAdvanceDetailList(IPage<Object> page, @Param("orderCode") String orderCode);
+
+	Map<String, Integer> billladingNum(@Param("warehouseId") Long warehouseId, @Param("startByDateStr") Date startByDateStr, @Param("endByDateStr") Date endByDateStr);
 }

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>
 
@@ -109,9 +148,10 @@
         select ldsa.service_number serviceNum,
                ldsa.order_code orderCode,
                ldsa.total_number totalNum,
-               ldsa.incoming_num scanNum
+               IFNULL(ldsa.incoming_num,0) scanNum
         from logpm_distribution_stock_article ldsa
-        where ldsa.warehouse_entry_time &gt;= #{startByDateStr}
+        where ldsa.is_zero != 1
+        and ldsa.warehouse_entry_time &gt;= #{startByDateStr}
         and ldsa.warehouse_entry_time &lt;= #{endByDateStr}
         and warehouse_id = #{warehouseId}
     </select>
@@ -123,4 +163,15 @@
         where order_code = #{orderCode}
     </select>
 
+    <select id="billladingNum" resultType="java.util.Map">
+        select sum(ldsa.total_number) totalNum,
+               sum(IFNULL(ldsa.incoming_num,0)) scanNum
+        from logpm_distribution_stock_article ldsa
+        where ldsa.is_zero != 1
+        and ldsa.warehouse_entry_time &gt;= #{startByDateStr}
+        and ldsa.warehouse_entry_time &lt;= #{endByDateStr}
+        and warehouse_id = #{warehouseId}
+    </select>
+
+
 </mapper>

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

@@ -13,4 +13,5 @@ public interface TrunklineBillladingPackageMapper extends BaseMapper<TrunklineBi
 
     IPage<TrunklineBillladingPackageVO> findBillladingPackageDetail(IPage<Object> page, @Param("param") BillladingDTO billladingDTO);
 
+    TrunklineBillladingPackageEntity findBillladingPackage(@Param("packageCode") String packageCode);
 }

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

@@ -57,4 +57,11 @@
 
     </select>
 
+    <select id="findBillladingPackage" resultType="com.logpm.trunkline.entity.TrunklineBillladingPackageEntity">
+        select *
+        from logpm_trunkline_billlading_package
+        where order_package_code = #{packageCode}
+    </select>
+
+
 </mapper>

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>
 

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

@@ -22,6 +22,7 @@
                ltcl.create_user_name createUserName,
                ltcl.create_time createTime,
                ltcl.now_warehouse_id nowWarehouseId,
+               ltcl.count_transport_cost countTransportCost,
                sum(ltcll.now_transport_cost) nowTransportCost,
                sum(ltcll.oil_cost) oilCost,
                sum(ltcll.back_transport_cost) backTransportCost,
@@ -56,7 +57,8 @@
                  ltcl.end_warehouse_names,
                  ltcl.arrive_time,
                  ltcl.start_time,
-                 ltcl.now_warehouse_id
+                 ltcl.now_warehouse_id,
+                 ltcl.count_transport_cost
     </select>
 
 
@@ -119,6 +121,7 @@
     <select id="findAllOrderList" resultType="com.logpm.trunkline.vo.CarsLoadAllOrderVO">
         select t.order_code orderCode,
         t.waybill_number waybillNo,
+        t.entry_time_end warehouseEntryTimeEnd,
         lww.create_time createTime,
         lww.destination destination,
         lww.destination_warehouse_name destinationWarehouseName,
@@ -138,7 +141,8 @@
         from (select ldpl.order_code,
         ldpl.waybill_number,
         ldsa.is_zero,
-        IF(ldsa.is_zero = 1,ldsa.hand_quantity,count(ldpl.id)) stock_num
+        IF(ldsa.is_zero = 1,ldsa.hand_quantity,count(ldpl.id)) stock_num,
+        max(ldpl.warehouse_entry_time_end) entry_time_end
         from logpm_distribution_stock_article ldsa
         left join logpm_distribution_parcel_list ldpl on ldsa.order_code = ldpl.order_code
         where ldpl.is_deleted = 0
@@ -184,6 +188,40 @@
         group by ltwo.waybill_no,
         ltwo.order_code) m on m.order_code = t.order_code and m.waybill_no = t.waybill_number
         where IFNULL( t.stock_num, 0 )-IFNULL( l.planNum,0) > 0
+        <if test="param.openTimeStart != null">
+            and lww.create_time &gt;= #{param.openTimeStart}
+        </if>
+        <if test="param.openTimeEnd != null">
+            and lww.create_time &lt;= #{param.openTimeEnd}
+        </if>
+        <if test="param.enterTimeStart != null">
+            and t.entry_time_end &gt;= #{param.enterTimeStart}
+        </if>
+        <if test="param.enterTimeEnd != null">
+            and t.entry_time_end &lt;= #{param.enterTimeEnd}
+        </if>
+        <if test="param.destination != null and param.destination != ''">
+            and lww.destination like concat('%',#{param.destination},'%')
+        </if>
+        <if test="param.destinationWarehouseName != null and param.destinationWarehouseName != ''">
+            and lww.destination_warehouse_name like concat('%',#{param.destinationWarehouseName},'%')
+        </if>
+        <if test="param.productName != null and param.productName != ''">
+            and lww.goods_name like concat('%',#{param.productName},'%')
+        </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.customerTrain != null and param.customerTrain != ''">
+            and lww.customer_train like concat('%',#{param.customerTrain},'%')
+        </if>
+        <if test="param.remark != null and param.remark != ''">
+            and lww.remark like concat('%',#{param.remark},'%')
+        </if>
+
     </select>
 
     <select id="findUseOrderList" resultType="com.logpm.trunkline.vo.CarsLoadAllOrderVO">

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

@@ -13,7 +13,7 @@ import java.util.List;
 
 public interface ITrunklineAdvanceService extends BaseService<TrunklineAdvanceEntity> {
 
-	void saveOrderAndPackage(TrunklineAdvanceDetailEntity advanceDetailEntity, Long warehouseId);
+	boolean saveOrderAndPackage(TrunklineAdvanceDetailEntity advanceDetailEntity, Long warehouseId);
 
     IPage<TrunklineAdvanceVO> advancePageList(IPage<Object> page, AdvanceDTO advanceDTO);
 

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

@@ -12,4 +12,6 @@ public interface ITrunklineBillladingPackageServicie extends BaseService<Trunkli
 
 	IPage<TrunklineBillladingPackageVO> findBillladingPackageDetail(IPage<Object> page, BillladingDTO billladingDTO);
 
+    TrunklineBillladingPackageEntity findBillladingPackage(String packageCode);
+
 }

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

@@ -5,7 +5,6 @@ import com.logpm.trunkline.dto.BillladingDTO;
 import com.logpm.trunkline.dto.BillladingWaybillDTO;
 import com.logpm.trunkline.entity.TrunklineBillladingEntity;
 import com.logpm.trunkline.vo.TrunklineBillladingDetailListVO;
-import com.logpm.trunkline.vo.TrunklineBillladingDetailVO;
 import com.logpm.trunkline.vo.TrunklineBillladingVO;
 import org.springblade.core.mp.base.BaseService;
 import org.springblade.core.tool.api.R;
@@ -42,7 +41,7 @@ public interface ITrunklineBillladingService extends BaseService<TrunklineBillla
 
 	R findCarrierByName(String carrierName);
 
-	IPage<TrunklineBillladingDetailVO> billladingList(BillladingDTO billladingDTO);
+	R billladingList(BillladingDTO billladingDTO);
 
 	IPage<TrunklineBillladingDetailListVO> findAdvanceDetailList(BillladingDTO billladingDTO);
 }

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

@@ -72,7 +72,7 @@ public interface ITrunklineCarsLoadService extends BaseService<TrunklineCarsLoad
 
 	R loadingDetail(LoadCarsDTO loadCarsDTO);
 
-	R loadingScan(Long loadId,Long warehouseId,String orderPackageCode,String trayCode);
+	R loadingScan(Long loadId,Long warehouseId,String orderPackageCode,String trayCode,String remark);
 
 	R loadingZero(Long loadId, Long warehouseId, String waybillNo,String orderCode, String trayCode, Integer enterNum,String remark);
 
@@ -165,4 +165,6 @@ public interface ITrunklineCarsLoadService extends BaseService<TrunklineCarsLoad
 	R batchSign(LoadCarsDTO loadCarsDTO);
 
 	R updateBelongToWarehouseBySignOrderId(LoadCarsDTO loadCarsDTO);
+
+	R manualLoading(LoadCarsDTO loadCarsDTO, String remark);
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.logpm.trunkline.bean.Resp;
 import com.logpm.trunkline.dto.InComingDTO;
 import com.logpm.trunkline.entity.TrunklineAdvanceDetailEntity;
+import com.logpm.trunkline.entity.TrunklineBillladingPackageEntity;
 import com.logpm.trunkline.service.IInComingService;
 import com.logpm.trunkline.service.ITrunklineAdvanceDetailService;
 import com.logpm.trunkline.service.ITrunklineAdvanceService;
@@ -62,22 +63,29 @@ public class InComingServiceImpl implements IInComingService {
 			advanceDetailService.updatePackageStatusById("1",advanceDetailId);
 
 			//2.判断包件和订单是否已经存入在库订单
-			advanceService.saveOrderAndPackage(advanceDetailEntity,warehouseId);
+			boolean b = advanceService.saveOrderAndPackage(advanceDetailEntity, warehouseId);
 
-			//3.根据是否有提货单id绑定提货单
-			if(!Objects.isNull(billladingId)){
-				billladingPackageServicie.saveEntity(packageCode,billladingId,warehouseId,incomingType);
-			}
+			if(b){
+				//3.根据是否有提货单id绑定提货单
+				if(!Objects.isNull(billladingId)){
+					//先判断该包件是否已经有提货记录了
+					TrunklineBillladingPackageEntity billladingPackageEntity = billladingPackageServicie.findBillladingPackage(packageCode);
+					if(Objects.isNull(billladingPackageEntity)){
+						billladingPackageServicie.saveEntity(packageCode,billladingId,warehouseId,incomingType);
+					}
+				}
 
-			//4.如果有托盘码
-			if(StringUtil.isNotBlank(trayCode) && StringUtil.isNotBlank(trayType)){
-				Map<String,Object> map = new HashMap<>();
-				map.put("trayType",trayType);
-				map.put("trayCode",trayCode);
-				map.put("warehouseId",warehouseId);
-				map.put("orderPackageCode",packageCode);
-				warehouseTrayTypeClient.orderScanOrderPackageCode(map);
+				//4.如果有托盘码
+				if(StringUtil.isNotBlank(trayCode) && StringUtil.isNotBlank(trayType)){
+					Map<String,Object> map = new HashMap<>();
+					map.put("trayType",trayType);
+					map.put("trayCode",trayCode);
+					map.put("warehouseId",warehouseId);
+					map.put("orderPackageCode",packageCode);
+					warehouseTrayTypeClient.orderScanOrderPackageCode(map);
+				}
 			}
+
 		}
 		return R.success("入库成功");
 	}

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

@@ -384,7 +384,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 			warehouseWaybillDetailClient.addList(details);
 		}else{
 			log.info("#################openWaybill: 运单保存失败");
-			return R.fail(405,"运单保存失败");
+			throw new CustomerException(405,"运单保存失败");
 		}
 
 		//绑定订单和运单的关系
@@ -393,7 +393,11 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		Set<String> orderCodes = new TreeSet<>();
 		for (TrunklineAdvanceEntity advanceEntity:advanceEntityList){
 			Long advanceId = advanceEntity.getId();
-
+			String waybillStatus = advanceEntity.getWaybillStatus();
+			if("1".equals(waybillStatus)){
+				log.error("###############openWaybill: 已存在已开单的暂存单");
+				throw new CustomerException(405,"已存在已开单的暂存单");
+			}
 			TrunklineWaybillOrderEntity waybillOrderEntity = new TrunklineWaybillOrderEntity();
 			waybillOrderEntity.setWarehouseId(warehouseId);
 			waybillOrderEntity.setWarehouseName(basicdataWarehouseEntity.getName());

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

@@ -52,7 +52,7 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 
 
 	@Override
-	public void saveOrderAndPackage(TrunklineAdvanceDetailEntity advanceDetailEntity, Long warehouseId) {
+	public boolean saveOrderAndPackage(TrunklineAdvanceDetailEntity advanceDetailEntity, Long warehouseId) {
 		String orderPackageCode = advanceDetailEntity.getOrderPackageCode();
 		String orderCode = advanceDetailEntity.getOrderCode();
 		Long advanceId = advanceDetailEntity.getAdvanceId();
@@ -68,7 +68,7 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 		DistributionParcelListEntity parcelListEntity = parcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode, warehouseId);
 		if(!Objects.isNull(parcelListEntity)){
 			log.warn("############saveOrderAndPackage: 包件信息已存在 orderPackageCode={} warehouseId={}",orderPackageCode,warehouseId);
-			throw new CustomerException(405,"包件信息已存在");
+			return true;
 		}
 
 		TrunklineAdvanceEntity advanceEntity = getById(advanceId);
@@ -263,6 +263,7 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 //			stockArticleClient.saveOrUpdate(stockArticleEntity);
 		}
 		log.info("#############saveOrderAndPackage: 订单包件信息保存完成 OrderPackageCode={}",advanceDetailEntity.getOrderPackageCode());
+		return true;
 	}
 
 	@Override

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

@@ -171,4 +171,9 @@ public class TrunklineBillladingPackageServiceImpl extends BaseServiceImpl<Trunk
 		return baseMapper.findBillladingPackageDetail(page,billladingDTO);
 	}
 
+	@Override
+	public TrunklineBillladingPackageEntity findBillladingPackage(String packageCode) {
+		return baseMapper.findBillladingPackage(packageCode);
+	}
+
 }

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

@@ -26,10 +26,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -102,6 +99,7 @@ public class TrunklineBillladingServiceImpl extends BaseServiceImpl<TrunklineBil
 			billladingLineEntity.setWarehouseName(warehouseName);
 			billladingLineService.save(billladingLineEntity);
 		}
+		lineTitle = lineTitle + "-->" + warehouseName;
 		trunklineBillladingEntity.setLineNameTitle(lineTitle);
 		updateById(trunklineBillladingEntity);
 
@@ -445,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);
 	}
@@ -523,7 +523,7 @@ public class TrunklineBillladingServiceImpl extends BaseServiceImpl<TrunklineBil
 	}
 
 	@Override
-	public IPage<TrunklineBillladingDetailVO> billladingList(BillladingDTO billladingDTO) {
+	public R billladingList(BillladingDTO billladingDTO) {
 		Integer pageNum = billladingDTO.getPageNum();
 		Integer pageSize = billladingDTO.getPageSize();
 		String startDateStr = billladingDTO.getStartDateStr();
@@ -534,9 +534,16 @@ public class TrunklineBillladingServiceImpl extends BaseServiceImpl<TrunklineBil
 		page.setCurrent(pageNum);
 		page.setSize(pageSize);
 
+		Map<String,Integer> map = baseMapper.billladingNum(warehouseId,CommonUtil.getStartByDateStr(startDateStr),CommonUtil.getEndByDateStr(endDateStr));
 		IPage<TrunklineBillladingDetailVO> ls =  baseMapper.billladingList(page,warehouseId,CommonUtil.getStartByDateStr(startDateStr),CommonUtil.getEndByDateStr(endDateStr));
 
-		return ls;
+		Map<String,Object> m = new HashMap<>();
+		if(!Objects.isNull(map)){
+			m.put("totalNum",map.get("totalNum"));
+			m.put("scanNum",map.get("scanNum"));
+		}
+		m.put("page",ls);
+		return R.data(m);
 	}
 
 	@Override

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

@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.logpm.basicdata.entity.BasicdataDriverArteryEntity;
 import com.logpm.basicdata.entity.BasicdataTrayEntity;
 import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
 import com.logpm.basicdata.feign.IBasicdataCodeClient;
@@ -944,20 +943,25 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		String endWarehouseIds = loadEntity.getEndWarehouseIds();
 		String allWarehouseIds = startWarehouseId+","+endWarehouseIds;
 
+		String loadType1 = loadEntity.getLoadType();
+
 		Long nowWarehouseId = loadEntity.getNowWarehouseId();
 		if(!nowWarehouseId.equals(warehouseId)){
 			log.warn("###############selectEditDetailByLoadId: 配载计划不在当前节点 nowWarehouseId={} warehouseId={}",nowWarehouseId,warehouseId);
 			return R.fail(405,"配载计划不在当前节点");
 		}
-		TrunklineCarsLoadLineEntity endCarsLoadLineEntity = trunklineCarsLoadLineService.findEndNodeByLoadId(loadId);
-		if(Objects.isNull(endCarsLoadLineEntity)){
-			log.warn("###############selectEditDetailByLoadId: 终点节点信息不存在 loadId={}",loadId);
-			return R.fail(405,"终点节点信息不存在");
-		}
-		Long endNodeId = endCarsLoadLineEntity.getNodeId();
-		if(endNodeId.equals(warehouseId)){
-			log.warn("###############selectEditDetailByLoadId: 终点节点不能编辑配载 loadId={}",loadId);
-			return R.fail(405,"终点节点不能编辑配载");
+
+		if(!"4".equals(loadType1)){
+			TrunklineCarsLoadLineEntity endCarsLoadLineEntity = trunklineCarsLoadLineService.findEndNodeByLoadId(loadId);
+			if(Objects.isNull(endCarsLoadLineEntity)){
+				log.warn("###############selectEditDetailByLoadId: 终点节点信息不存在 loadId={}",loadId);
+				return R.fail(405,"终点节点信息不存在");
+			}
+			Long endNodeId = endCarsLoadLineEntity.getNodeId();
+			if(endNodeId.equals(warehouseId)){
+				log.warn("###############selectEditDetailByLoadId: 终点节点不能编辑配载 loadId={}",loadId);
+				return R.fail(405,"终点节点不能编辑配载");
+			}
 		}
 
 		TrunklineCarsLoadLineEntity carsLoadLineEntity = trunklineCarsLoadLineService.findEntityByLoadIdAndNodeId(loadId, warehouseId);
@@ -1008,6 +1012,20 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		String loadType = carsLoadDTO.getLoadType();
 		String assistantName = carsLoadDTO.getAssistantName();
 		String assistantMobile = carsLoadDTO.getAssistantMobile();
+		Long carrierId = carsLoadDTO.getCarrierId();
+		String carrierName = carsLoadDTO.getCarrierName();
+		String operator = carsLoadDTO.getOperator();
+		String deliveryType = carsLoadDTO.getDeliveryType();
+		String payMethod = carsLoadDTO.getPayMethod();
+		String customerType = carsLoadDTO.getCustomerType();
+		String isSettlement = carsLoadDTO.getIsSettlement();
+		BigDecimal replacePrice = carsLoadDTO.getReplacePrice();
+		String carrierOrderCode = carsLoadDTO.getCarrierOrderCode();
+		String carrierTimestr = carsLoadDTO.getCarrierTimeStr();
+		String receivingTimeStr = carsLoadDTO.getReceivingTimeStr();
+		BigDecimal countTransportCost = carsLoadDTO.getCountTransportCost();
+		BigDecimal settlementValue = carsLoadDTO.getSettlementValue();
+
 		List<TrunklineCarsLoadLineDTO> addCarsLoadLineList = carsLoadDTO.getAddCarsLoadLineList();
 		List<TrunklineCarsLoadLineDTO> removeCarsLoadLineList = carsLoadDTO.getRemoveCarsLoadLineList();
 
@@ -1027,6 +1045,19 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		carsLoadEntity.setCarNumber(carNumber);
 		carsLoadEntity.setLoadType(loadType);
 		carsLoadEntity.setRemark(remark);
+		carsLoadEntity.setCarrierId(carrierId);
+		carsLoadEntity.setCarrierName(carrierName);
+		carsLoadEntity.setOperator(operator);
+		carsLoadEntity.setDeliveryType(deliveryType);
+		carsLoadEntity.setPayMethod(payMethod);
+		carsLoadEntity.setCustomerType(customerType);
+		carsLoadEntity.setIsSettlement(isSettlement);
+		carsLoadEntity.setReplacePrice(replacePrice);
+		carsLoadEntity.setCarrierOrderCode(carrierOrderCode);
+		carsLoadEntity.setCarrierTime(CommonUtil.StringToDate(carrierTimestr));
+		carsLoadEntity.setReceivingTime(CommonUtil.StringToDate(receivingTimeStr));
+		carsLoadEntity.setCountTransportCost(countTransportCost);
+		carsLoadEntity.setSettlementValue(settlementValue);
 		updateById(carsLoadEntity);
 
 		for (TrunklineCarsLoadLineDTO carsLoadLineDTO : removeCarsLoadLineList) {
@@ -1070,25 +1101,27 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 
 
 			Long carsLoadLineId = carsLoadLineDTO.getId();
-			if(1 == updateType){
-				TrunklineCarsLoadLineEntity loadLineEntity = trunklineCarsLoadLineService.getById(carsLoadLineId);
-				loadLineEntity.setSort(sort);
-				trunklineCarsLoadLineService.updateById(loadLineEntity);
-			}else if(2 == updateType){
-				TrunklineCarsLoadLineEntity carsLoadLineEntity = new TrunklineCarsLoadLineEntity();
-				BeanUtil.copy(carsLoadLineDTO,carsLoadLineEntity);
-				carsLoadLineEntity.setId(null);
-				carsLoadLineEntity.setLoadId(loadId);
-				carsLoadLineEntity.setNodeStatus("0");
-				if(sort == 1){
-					carsLoadLineEntity.setNodeStatus("10");
+			if(!Objects.isNull(updateType)){
+				if(1 == updateType){
+					TrunklineCarsLoadLineEntity loadLineEntity = trunklineCarsLoadLineService.getById(carsLoadLineId);
+					loadLineEntity.setSort(sort);
+					trunklineCarsLoadLineService.updateById(loadLineEntity);
+				}else if(2 == updateType){
+					TrunklineCarsLoadLineEntity carsLoadLineEntity = new TrunklineCarsLoadLineEntity();
+					BeanUtil.copy(carsLoadLineDTO,carsLoadLineEntity);
+					carsLoadLineEntity.setId(null);
+					carsLoadLineEntity.setLoadId(loadId);
+					carsLoadLineEntity.setNodeStatus("0");
+					if(sort == 1){
+						carsLoadLineEntity.setNodeStatus("10");
+					}
+					carsLoadLineEntity.setSignStatus("0");
+					carsLoadLineEntity.setUnloadStatus("0");
+					carsLoadLineEntity.setLoadingStatus("0");
+					carsLoadLineEntity.setIsTermination("0");
+					trunklineCarsLoadLineService.save(carsLoadLineEntity);
+					carsLoadLineId = carsLoadLineEntity.getId();
 				}
-				carsLoadLineEntity.setSignStatus("0");
-				carsLoadLineEntity.setUnloadStatus("0");
-				carsLoadLineEntity.setLoadingStatus("0");
-				carsLoadLineEntity.setIsTermination("0");
-				trunklineCarsLoadLineService.save(carsLoadLineEntity);
-				carsLoadLineId = carsLoadLineEntity.getId();
 			}
 
 			List<TrunklineCarsOrderDTO> addList = carsLoadLineDTO.getAddList();
@@ -1144,6 +1177,16 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 //				loadCarsDTO.setOrderCodes(orderCodes);
 //			}
 //		}
+		String openTimeStartStr = loadCarsDTO.getOpenTimeStartStr();
+		String openTimeEndStr = loadCarsDTO.getOpenTimeEndStr();
+		loadCarsDTO.setOpenTimeStart(CommonUtil.getStartByDateStr(openTimeStartStr));
+		loadCarsDTO.setOpenTimeEnd(CommonUtil.getEndByDateStr(openTimeEndStr));
+
+		String enterTimeStartStr = loadCarsDTO.getEnterTimeStartStr();
+		String enterTimeEndStr = loadCarsDTO.getEnterTimeEndStr();
+		loadCarsDTO.setEnterTimeStart(CommonUtil.getStartByDateStr(enterTimeStartStr));
+		loadCarsDTO.setEnterTimeEnd(CommonUtil.getStartByDateStr(enterTimeEndStr));
+
 		IPage<CarsLoadAllOrderVO> pageList = baseMapper.findAllOrderList(page,loadCarsDTO);
 		return R.data(pageList);
 	}
@@ -1622,7 +1665,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 	}
 
 	@Override
-	public R loadingScan(Long loadId,Long warehouseId,String orderPackageCode,String trayCode) {
+	public R loadingScan(Long loadId,Long warehouseId,String orderPackageCode,String trayCode,String remark) {
 		log.info("#################loadingScan: 装车扫描");
 
 		TrunklineCarsLoadEntity carsLoadEntity = baseMapper.selectById(loadId);
@@ -1667,7 +1710,6 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		String trayName = null;
 		Long fromWarehouseId = null;
 		Long loadScanId = null;
-		String remark = null;
 
 
 		//判断包条码是不是在库
@@ -2375,6 +2417,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		Integer enterNum = loadCarsDTO.getEnterNum();
 		Long warehouseId = loadCarsDTO.getWarehouseId();
 
+		String orders = null;
 		if(0 == isZero){
 			unloadPackage(loadId,orderPackageCode,warehouseId,1,"卸分一体 卸车");
 			Map<String,Object> map = new HashMap<>();
@@ -2387,6 +2430,9 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 				log.warn("##########findNextNodeList: 打托失败 trayCode={} orderPackageCode={}",trayCode,orderPackageCode);
 				return R.fail(405,"打托失败");
 			}
+			DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode, warehouseId);
+			orders = parcelListEntity.getOrderCode();
+
 		}else{
 
 			unloadZero(loadId,waybillNo,enterNum,warehouseId,1,null,orderCode,"卸分一体 卸车");
@@ -2402,9 +2448,13 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 				log.warn("##########findNextNodeList: 打托失败 trayCode={} orderCode={}",trayCode,orderCode);
 				return R.fail(405,"打托失败");
 			}
+			orders = orderCode;
+
 		}
 
-		return R.success("打托成功");
+		Map<String,Object> map = new HashMap<>();
+		map.put("orders",orders);
+		return R.data(map);
 	}
 
 	@Override
@@ -3218,6 +3268,63 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		return R.success("更新成功");
 	}
 
+	@Override
+	public R manualLoading(LoadCarsDTO loadCarsDTO, String remark) {
+		Long loadId = loadCarsDTO.getLoadId();
+		Long warehouseId = loadCarsDTO.getWarehouseId();
+		TrunklineCarsLoadEntity carsLoadEntity = baseMapper.selectById(loadId);
+		if(Objects.isNull(carsLoadEntity)){
+			log.warn("##############manualLoading: 配载计划不存在 loadId={}",loadId);
+			return R.fail(405,"配载计划不存在");
+		}
+
+		BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(warehouseId);
+		if(Objects.isNull(warehouseEntity)){
+			log.warn("##############manualLoading: 仓库信息不存在 warehouseId={}",warehouseId);
+			return R.fail(405,"仓库信息不存在");
+		}
+
+		Long nowWarehouseId = carsLoadEntity.getNowWarehouseId();
+		if(!nowWarehouseId.equals(warehouseId)){
+			log.warn("##############manualLoading: 车辆不在当前仓 warehouseId={}",warehouseId);
+			return R.fail(405,"车辆不在当前仓");
+		}
+
+		//查询有哪些在当前仓做计划的订单
+		List<TrunklineCarsOrderEntity> carsOrderEntityList = trunklineCarsOrderService.findListByLoadIdAndNodeId(loadId, warehouseId);
+		for (TrunklineCarsOrderEntity carsOrderEntity : carsOrderEntityList) {
+			Integer type = carsOrderEntity.getType();
+			if(type.equals(1)){
+				//订制品订单
+				String orderCode = carsOrderEntity.getOrderCode();
+				Integer planNum = carsOrderEntity.getPlanNum();
+				List<DistributionParcelListEntity> entityListByOrderCode = distributionParcelListClient.findEntityListByOrderCodeAndStatus(orderCode, warehouseId,"20");
+				int size = entityListByOrderCode.size();
+				if(planNum.equals(size)){
+					for (DistributionParcelListEntity parcelListEntity : entityListByOrderCode) {
+						String orderPackageCode = parcelListEntity.getOrderPackageCode();
+						//查询包件是否已经装车
+						TrunklineCarsLoadScanEntity carsLoadScanEntity = trunklineCarsLoadScanService.findEntityByLoadIdAndOrderPackageCode(loadId, orderPackageCode);
+						if(Objects.isNull(carsLoadScanEntity)){
+							loadingScan(loadId,warehouseId,orderPackageCode,null,"手动一键装车");
+						}
+					}
+				}
+			}else if(type.equals(2)){
+				//零担订单
+				String orderCode = carsOrderEntity.getOrderCode();
+				String waybillNo = carsOrderEntity.getWaybillNo();
+				Integer planNum = carsOrderEntity.getPlanNum();
+				Integer realNum = carsOrderEntity.getRealNum();
+				if(realNum.equals(0)){
+					loadingZero(loadId,warehouseId,waybillNo,orderCode,null,planNum,"手动一键装车");
+				}
+			}
+		}
+
+		return R.success("装车完成");
+	}
+
 	@Override
 	public R loadingTrayInfo(LoadCarsDTO loadCarsDTO) {
 		log.info("##############loadingTrayInfo: 查询托盘的货物信息");
@@ -3295,7 +3402,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		Integer zeroNum = 0;
 		for (LoadingPackageDTO loadingPackageDTO : packageList) {
 			String orderPackageCode = loadingPackageDTO.getOrderPackageCode();
-			loadingScan(loadId,warehouseId,orderPackageCode,trayCode);
+			loadingScan(loadId,warehouseId,orderPackageCode,trayCode,"托盘正常装车");
 			pacakagNum = pacakagNum + 1;
 		}
 

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

@@ -6,10 +6,7 @@ import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
 import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
 import com.logpm.distribution.vo.UpDownStockupAreaVO;
 import com.logpm.warehouse.bean.Resp;
-import com.logpm.warehouse.dto.UpShelfPackageDTO;
-import com.logpm.warehouse.dto.UpShelfStockDTO;
-import com.logpm.warehouse.dto.UpStockupAreaPackageDTO;
-import com.logpm.warehouse.dto.UpdownTypeDTO;
+import com.logpm.warehouse.dto.*;
 import com.logpm.warehouse.entity.WarehouseUpdownStockupAreaEntity;
 import com.logpm.warehouse.service.IWarehouseUpdownStockupAreaService;
 import com.logpm.warehouse.service.IWarehouseUpdownTypeService;
@@ -316,7 +313,7 @@ public class WarehouseUpdownStockupAreaApiController {
 		String method = "###########upShelfZeroStockArticle: ";
 		log.info(method + "上架零担 updownTypeDTO={}", updownTypeDTO);
 		Long allocationId = updownTypeDTO.getAllocationId();//库位编码
-		List<UpShelfStockDTO> upShelfStockList = updownTypeDTO.getUpShelfStockList();
+		List<UpShelfZeroOrderDTO> upShelfZeroOrderList = updownTypeDTO.getUpShelfZeroOrderList();
 		try{
 			BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
 			if(Objects.isNull(myCurrentWarehouse)){
@@ -324,13 +321,13 @@ public class WarehouseUpdownStockupAreaApiController {
 				return R.fail(403,"仓库信息不能为空");
 			}
 
-			int size = upShelfStockList.size();
+			int size = upShelfZeroOrderList.size();
 			if(size == 0 ){
 				log.warn(method+"没有处理的数据");
 				return R.fail(403,"无处理数据");
 			}
 
-			for (UpShelfStockDTO dto:upShelfStockList){
+			for (UpShelfZeroOrderDTO dto:upShelfZeroOrderList){
 				Integer enterNum = dto.getEnterNum();
 				if(Objects.isNull(enterNum) || enterNum == 0){
 					log.warn(method+"请输入正确的数量");
@@ -344,7 +341,7 @@ public class WarehouseUpdownStockupAreaApiController {
 			}
 
 			//查询该库位的货物信息
-			return warehouseUpdownStockupAreaService.upShelfStockList(upShelfStockList,allocationId,myCurrentWarehouse.getId());
+			return warehouseUpdownStockupAreaService.upShelfZeroStockeArticle(upShelfZeroOrderList,allocationId,myCurrentWarehouse.getId());
 		}catch (CustomerException e){
 			log.warn(e.message);
 			return R.fail(e.code,e.message);
@@ -354,4 +351,48 @@ public class WarehouseUpdownStockupAreaApiController {
 		}
 	}
 
+
+	@ResponseBody
+	@PostMapping("/upShelfScanTray")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "备货库位上架扫描托盘", notes = "传入trayTypeDTO")
+	public R upShelfScanTray(@RequestBody UpdownTypeDTO updownTypeDTO ) {
+		String method = "###########upShelfScanTray: ";
+		log.info(method + "上架扫描托盘 updownTypeDTO={}", updownTypeDTO);
+		try{
+			BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
+			if(Objects.isNull(myCurrentWarehouse)){
+				log.warn(method+"仓库信息不能为空");
+				return R.fail(403,"仓库信息不能为空");
+			}
+			//查询该库位的货物信息
+			UpDownStockupAreaVO upDownStockupAreaVO = warehouseUpdownStockupAreaService.upShelfScanPackage(myCurrentWarehouse.getId(), updownTypeDTO.getOrderPackageCode());
+			//此包件是否已经完成上架了
+			if (Func.isNotEmpty(upDownStockupAreaVO)){
+				//查询是否上架
+				WarehouseUpdownStockupAreaEntity updownStockupAreaEntity = warehouseUpdownStockupAreaService.getOne(Wrappers.<WarehouseUpdownStockupAreaEntity>query().lambda()
+					.eq(WarehouseUpdownStockupAreaEntity::getWarehouseId, myCurrentWarehouse.getId())
+					.eq(WarehouseUpdownStockupAreaEntity::getAssociationValue, upDownStockupAreaVO.getAssociationValue())
+					.eq(WarehouseUpdownStockupAreaEntity::getAllocationId, upDownStockupAreaVO.getAssociationId())
+					.eq(WarehouseUpdownStockupAreaEntity::getGoodsType, upDownStockupAreaVO.getGoodsType())
+				);
+				if (Func.isNotEmpty(updownStockupAreaEntity)){
+					//已经在备货库位进行上架了
+					return Resp.scanFail("该包件已上架","该包件已上架");
+				}
+				return R.data(upDownStockupAreaVO);
+			}else {
+				return Resp.scanFail("该包件不存在","该包件不存在");
+			}
+		}catch (CustomerException e){
+			log.warn(e.message);
+			return Resp.scanFail(e.code,e.message,e.message);
+		}catch (Exception e){
+			log.error(method+"系统异常，联系管理员",e);
+			return R.fail(500,"系统异常，联系管理员");
+		}
+	}
+
+
+
 }

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/UpShelfZeroOrderDTO.java

@@ -13,6 +13,13 @@ public class UpShelfZeroOrderDTO implements Serializable {
 	private String waybillCode;//运单号
 	@ApiModelProperty(name = "订单号",notes = "订单号")
 	private String orderCode;//订单号
+	private String marketName;//商场名称
+	private String marketId;//商场ID
+	private String associationType;//商场ID
+	private String associationValue;//商场ID
+	private String associationId;//商场ID
+	private String goodsType;//商场ID
+	private String goodsName;//商场ID
 	@ApiModelProperty(name = "录入数量",notes = "录入数量")
 	private Integer enterNum;//录入数量
 	@ApiModelProperty(name = "库位id",notes = "库位id")

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

@@ -35,4 +35,12 @@ public interface WarehouseTrayTypeMapper extends BaseMapper<WarehouseTrayTypeEnt
 	void updateStockByTrayTypeId(@Param("orderTotalNum")Integer orderTotalNum, @Param("enterNum") Integer enterNum, @Param("trayTypeId") Long trayTypeId);
 
     List<OrderPackageInfoVO> findOrderPackageList(@Param("list")List<String> orderPackageList);
+
+	/**
+	 * 查询零担订单
+	 * @param orderId
+	 * @param warehouseId
+	 * @return
+	 */
+	TrayTypeDataListVO getZeroOrderByOrderId(@Param("orderId")Long orderId,@Param("warehouseId") Long warehouseId);
 }

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

@@ -102,6 +102,17 @@
             #{item}
         </foreach>
     </select>
+    <select id="getZeroOrderByOrderId" resultType="com.logpm.warehouse.vo.TrayTypeDataListVO">
+        select ldsa.id dataId,
+        ldsa.waybill_number waybillNo,
+        ldsa.order_code dataCode,
+        ldsa.hand_quantity orderTotalNum
+        from logpm_distribution_stock_article ldsa
+        where ldsa.is_deleted = 0
+        and ldsa.is_zero = 1
+        and ldsa.id = #{orderId}
+        and ldsa.warehouse_id = #{warehouseId}
+    </select>
 
 
 </mapper>

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

@@ -82,4 +82,12 @@ public interface WarehouseUpdownStockupAreaMapper extends BaseMapper<WarehouseUp
 	 * @return
 	 */
 	List<Map<String, Object>> selectStockUpAreaStockList(@Param("warehouseId")Long warehouseId,@Param("allocationId") Long allocationId);
+
+	/**
+	 *
+	 * @param warehouseId
+	 * @param allocationId
+	 * @return
+	 */
+	List<Map<String, Object>> selectStockUpAreaZeroStockArticle(@Param("warehouseId")Long warehouseId,@Param("allocationId") Long allocationId );
 }

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

@@ -135,6 +135,22 @@
         GROUP BY
         lwusa.incoming_batch
     </select>
+    <select id="selectStockUpAreaZeroStockArticle" resultType="java.util.Map">
+        SELECT
+        ldsa.order_code AS orderCode,
+        ldsa.waybill_number AS waybillNumber,
+        ldsa.total_number AS totalNumber,
+        lwusa.num AS totalNum,
+        IF(ldsa.total_number = sum( lwusa.num ),1,0) AS complete,
+        2 AS goodsType
+        FROM
+        logpm_warehouse_updown_stockup_area AS lwusa
+        LEFT JOIN logpm_distribution_stock_article AS ldsa ON ldsa.id = lwusa.association_id
+        WHERE
+        lwusa.allocation_id = #{allocationId} AND lwusa.warehouse_id = #{warehouseId} AND  lwusa.goods_type = '2' AND lwusa.association_type IN ('1')
+        GROUP BY
+        ldsa.id
+    </select>
 
 
 </mapper>

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseTrayTypeService.java

@@ -104,4 +104,13 @@ public interface IWarehouseTrayTypeService extends BaseService<WarehouseTrayType
 	R syncOldTrayData(String trayCode, String trayType, List<String> orderPackageCodes, Long warehouseId);
 
 	R findTrayData(String trayCode, Long warehouseId);
+
+	/**
+	 * 查询零担订单库内使用情况
+	 * @param orderId
+	 * @param warehouseId
+	 * @return
+	 */
+	Integer getZeroOrderByOrderId(Long orderId, Long warehouseId);
+
 }

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownStockupAreaService.java

@@ -22,6 +22,7 @@ import com.logpm.distribution.entity.DistributionParcelListEntity;
 import com.logpm.distribution.vo.UpDownStockupAreaVO;
 import com.logpm.warehouse.dto.UpShelfPackageDTO;
 import com.logpm.warehouse.dto.UpShelfStockDTO;
+import com.logpm.warehouse.dto.UpShelfZeroOrderDTO;
 import com.logpm.warehouse.dto.UpStockupAreaPackageDTO;
 import com.logpm.warehouse.entity.WarehouseUpdownGoodsEntity;
 import com.logpm.warehouse.entity.WarehouseUpdownStockupAreaEntity;
@@ -101,4 +102,22 @@ public interface IWarehouseUpdownStockupAreaService extends BaseService<Warehous
 	 */
 	R scanZeroStockArticle(String zeroStockArticleCode,Long warehouseId);
 
+	/**
+	 * 零担订单进行备货区库位上架
+	 * @param upShelfZeroOrderDTOS
+	 * @param allocationId
+	 * @param id
+	 * @return
+	 */
+	R upShelfZeroOrder(List<UpShelfZeroOrderDTO> upShelfZeroOrderDTOS, Long allocationId, Long id);
+
+	/**
+	 * 零担订单备货库位上架
+	 * @param upShelfZeroOrderList
+	 * @param allocationId
+	 * @param id
+	 * @return
+	 */
+	R upShelfZeroStockeArticle(List<UpShelfZeroOrderDTO> upShelfZeroOrderList, Long allocationId, Long id);
+
 }

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);

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java

@@ -3130,6 +3130,40 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 		return R.data(map);
 	}
 
+	/**
+	 * @param orderId
+	 * @param warehouseId
+	 * @return
+	 */
+	@Override
+	public Integer getZeroOrderByOrderId(Long orderId, Long warehouseId) {
+		TrayTypeDataListVO zeroOrderByWaybillCode = baseMapper.getZeroOrderByOrderId(orderId,warehouseId);
+//			Long orderId = trayTypeDataListVO.getDataId();
+		    //总数
+			Integer orderTotalNum = zeroOrderByWaybillCode.getOrderTotalNum();
+			//
+			Integer residueNum = orderTotalNum;
+			//查询该零担的库位数据
+			List<PositionVO> updownGoodsEntities = warehouseUpdownGoodsService.getUpdownGoodsByZeroOrderId(orderId,warehouseId);
+			//查询在托盘上还未进行上架的零担订单信息
+			List<PositionVO> trayGoodsEntities = warehouseTrayGoodsService.getTrayGoodsByZeroOrderIdNoAllocationId(orderId,warehouseId);
+			updownGoodsEntities.addAll(trayGoodsEntities);
+			for (PositionVO positionVO:updownGoodsEntities){
+				Integer num = positionVO.getNum();
+				residueNum = residueNum - num;
+			}
+			if (residueNum == 0){
+				//无可用数量，说明该零担订单此时处于上架和在托的情况
+				return 0;
+			}else if (residueNum > 0){
+				return residueNum;
+			}else {
+				//出现脏数据的情况
+				log.error("此零担订单数据错误,需要维护数据,订单ID:{}",orderId);
+				return -1;
+			}
+	}
+
 
 	private void saveOrderInfo(String orderCode, Integer oldWarehouseId, Long newWarehouseId) {
 

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownStockupAreaServiceImpl.java

@@ -17,7 +17,6 @@
 package com.logpm.warehouse.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.BeanUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.logpm.basicdata.entity.*;
 import com.logpm.basicdata.feign.IBasicdataGoodsAllocationClient;
@@ -33,10 +32,10 @@ import com.logpm.distribution.feign.IDistributionStockArticleClient;
 import com.logpm.distribution.feign.IDistributionStockListClient;
 import com.logpm.distribution.vo.UpDownStockupAreaVO;
 import com.logpm.warehouse.bean.Resp;
+import com.logpm.warehouse.dto.*;
 import com.logpm.warehouse.dto.UpShelfPackageDTO;
 import com.logpm.warehouse.dto.UpShelfStockDTO;
 import com.logpm.warehouse.dto.UpStockupAreaPackageDTO;
-import com.logpm.warehouse.dto.UpdownZeroOrderDTO;
 import com.logpm.warehouse.entity.*;
 import com.logpm.warehouse.feign.WarehouseGoodsAllocationClient;
 import com.logpm.warehouse.mapper.WarehouseUpdownStockupAreaMapper;
@@ -50,7 +49,6 @@ import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.core.tool.utils.StringUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -100,6 +98,8 @@ public class WarehouseUpdownStockupAreaServiceImpl extends BaseServiceImpl<Wareh
 
 	private final WarehouseGoodsAllocationClient warehouseGoodsAllocationClient;
 
+	private final IWarehouseTaryAllocationService warehouseTaryAllocationService;
+
 
 
 
@@ -367,6 +367,12 @@ public class WarehouseUpdownStockupAreaServiceImpl extends BaseServiceImpl<Wareh
 				List<Map<String,Object>> inventoryMap = baseMapper.selectStockUpAreaStockList(warehouseId,allocationId);
 				maps.addAll(inventoryMap);
 			}
+			//查询无数据零担订单信息
+			List<WarehouseUpdownStockupAreaEntity> notSourceOrderData = warehouseUpdownStockupAreaEntities.stream().filter(f -> "2".equals(f.getGoodsType())&& "1".equals(f.getAssociationType())).collect(Collectors.toList());
+			if (Func.isNotEmpty(notSourceOrderData)){
+				List<Map<String,Object>> zeroStockArticleMap = baseMapper.selectStockUpAreaZeroStockArticle(warehouseId,allocationId);
+				maps.addAll(zeroStockArticleMap);
+			}
 		}
 		return R.data(maps);
 	}
@@ -529,9 +535,123 @@ public class WarehouseUpdownStockupAreaServiceImpl extends BaseServiceImpl<Wareh
 			log.error(method+"查询零担订单失败");
 			return R.fail("请扫描正确订单");
 		}
-		return R.data(upDownStockupZeroByOrderCodeAndWarehouseId);
+		//查询该零担订单是否具备有在备货库位上架的条件
+		Integer a = warehouseTrayTypeService.getZeroOrderByOrderId(upDownStockupZeroByOrderCodeAndWarehouseId.getOrderId(),warehouseId);
+		if (a > 0){
+			return R.data(upDownStockupZeroByOrderCodeAndWarehouseId);
+		}else if (a == 0){
+			return R.fail(403,"请先对该订单进行下架操作");
+		}else {
+			log.error(method+"此订单数量异常");
+			return R.fail(403,"数据异常");
+		}
+
+
+	}
+
+	/**
+	 * @param upShelfZeroOrderDTOS
+	 * @param allocationId
+	 * @param id
+	 * @return
+	 */
+	@Override
+	public R upShelfZeroOrder(List<UpShelfZeroOrderDTO> upShelfZeroOrderDTOS, Long allocationId, Long id) {
+		//这里目前的上架方式仅仅是进行订单自编码的上架方式和托盘暂时没有绑定关系
+		//这里进行上架需要进行上架
+		return null;
+	}
+
+	/**
+	 * @param upShelfZeroOrderList
+	 * @param allocationId
+	 * @return
+	 */
+	@Override
+	public R upShelfZeroStockeArticle(List<UpShelfZeroOrderDTO> upShelfZeroOrderList, Long allocationId, Long warehouseId) {
+		String collected = upShelfZeroOrderList.stream().filter(f -> f.getEnterNum() <= 0).map(UpShelfZeroOrderDTO::getOrderCode).collect(Collectors.joining(","));
+		if (Func.isNotBlank(collected)){
+			return Resp.scanFail(collected+"请输入正确的上架数量" , "请输入正确的上架数量, 物料编码为");
+		}
+		List<UpShelfZeroOrderDTO> upShelfZeroOrderDTOS = upShelfZeroOrderList;
+		BasicdataGoodsAllocationEntity goodsAllocationEntity = basicdataGoodsAllocationClient.getEntityByAllocationId(allocationId);
+		if(Objects.isNull(goodsAllocationEntity)){
+			log.warn("##############upShelfOrder: 库位不存在 allocationId={}",allocationId);
+			return R.fail(403,"库位不存在");
+		}
+		String enableStatus = goodsAllocationEntity.getEnableStatus();
+		Long goodsShelfId = goodsAllocationEntity.getGoodsShelfId();
+		if("2".equals(enableStatus)){
+			log.warn("##############upShelfOrder: 库位已被禁用 allocationId={}",allocationId);
+			return R.fail(403,"库位已被禁用");
+		}
+		BasicdataGoodsShelfEntity goodsShelfEntity = basicdataGoodsShelfClient.getEntityByGoodsShelfId(goodsShelfId);
+		if(Objects.isNull(goodsShelfEntity)){
+			log.warn("##############upShelfOrder: 货架不存在 goodsShelfId={}",goodsShelfId);
+			return R.fail(403,"货架不存在");
+		}
+		Long goodsAreaId = goodsShelfEntity.getGoodsAreaId();
+		BasicdataGoodsAreaEntity goodsAreaEntity = basicdataGoodsAreaClient.getEntityByGoodsAreaId(goodsAreaId);
+		if(Objects.isNull(goodsAreaEntity)){
+			log.warn("##############upShelfOrder: 货区不存在 goodsAreaId={}",goodsAreaId);
+			return R.fail(403,"货区不存在");
+		}
+		String areaType = goodsAreaEntity.getAreaType();
+		if(!"1".equals(areaType)){
+			log.warn("#################upShelfOrder: 备货区不能上下架 goodsAreaId={}",goodsAreaId);
+			throw new CustomerException(403,"请扫描备货库位");
+		}
+
+		Long wid = goodsAreaEntity.getWarehouseId();
+		BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(wid);
+		if(Objects.isNull(warehouseEntity)){
+			log.warn("##############upShelfOrder: 仓库不存在 wid={}",wid);
+			return R.fail(403,"仓库不存在");
+		}
+		if(!wid.equals(warehouseId)){
+			log.warn("##############upShelfOrder: 库位不在本仓库中 warehouseId={}",warehouseId);
+			return R.fail(403,"库位不在本仓库中");
+		}
+		List<WarehouseUpdownStockupAreaEntity> warehouseUpdownStockupAreaEntities = new ArrayList<>();
+		List<WarehouseUpdownStockupAreaLogEntity> warehouseUpdownStockupAreaLogEntities = new ArrayList<>();
+		QueryWrapper<WarehouseUpdownStockupAreaEntity> updownTypeQueryWrapper = new QueryWrapper<>();
+		updownTypeQueryWrapper
+			.eq("allocation_id",allocationId)
+			.eq("shelf_id",goodsShelfId)
+			.eq("area_id",goodsAreaId)
+			.eq("is_deleted",0);
+		for (UpShelfZeroOrderDTO upShelfZeroOrderDTO : upShelfZeroOrderDTOS) {
+			updownTypeQueryWrapper.eq("association_value",upShelfZeroOrderDTO.getAssociationValue());
+			updownTypeQueryWrapper.eq("association_type",upShelfZeroOrderDTO.getAssociationType());
+			updownTypeQueryWrapper.eq("association_id",upShelfZeroOrderDTO.getAssociationId());
+			updownTypeQueryWrapper.eq("goods_type",upShelfZeroOrderDTO.getGoodsType());
+			WarehouseUpdownStockupAreaEntity updownStockupAreaEntity = this.getOne(updownTypeQueryWrapper);
+			if (Func.isNotEmpty(updownStockupAreaEntity)){
+				//备货库位上数量增加
+				//存在，需要进行新的上架数量维护
+				int updateNum = updownStockupAreaEntity.getNum() + upShelfZeroOrderDTO.getEnterNum();
+				updownStockupAreaEntity.setNum(updateNum);
+				this.updateById(updownStockupAreaEntity);
+				WarehouseUpdownStockupAreaLogEntity warehouseUpdownStockupAreaLogEntity = Func.copy(updownStockupAreaEntity, WarehouseUpdownStockupAreaLogEntity.class);
+				warehouseUpdownStockupAreaLogEntity.setBindingType(1);
+				warehouseUpdownStockupAreaLogEntity.setId(null);
+				warehouseUpdownStockupAreaLogEntity.setNum(upShelfZeroOrderDTO.getEnterNum());
+				warehouseUpdownStockupAreaLogEntities.add(warehouseUpdownStockupAreaLogEntity);
+			}else {
+				//在该备货库位上第一次进行上架操作
+				WarehouseUpdownStockupAreaEntity warehouseUpdownStockupArea = createdNewUpShelfZeroOrder(allocationId, warehouseId,  upShelfZeroOrderDTO, goodsAreaId, goodsAreaEntity, goodsShelfId, goodsShelfEntity, goodsAllocationEntity);
+				warehouseUpdownStockupAreaEntities.add(warehouseUpdownStockupArea);
+				WarehouseUpdownStockupAreaLogEntity warehouseUpdownStockupAreaLogEntity = Func.copy(warehouseUpdownStockupArea, WarehouseUpdownStockupAreaLogEntity.class);
+				warehouseUpdownStockupAreaLogEntity.setBindingType(1);
+				warehouseUpdownStockupAreaLogEntities.add(warehouseUpdownStockupAreaLogEntity);
+			}
+		}
+		warehouseUpdownStockupAreaLogService.saveBatch(warehouseUpdownStockupAreaLogEntities);
+
+		return R.status(this.saveBatch(warehouseUpdownStockupAreaEntities));
 	}
 
+
 	private  WarehouseUpdownStockupAreaEntity  createdNewUpShelfInventory(Long allocationId, Long warehouseId, UpShelfStockDTO upShelfStockDTO, WarehouseUpdownStockupAreaEntity updownTypeEntity, Long goodsAreaId, BasicdataGoodsAreaEntity goodsAreaEntity, Long goodsShelfId, BasicdataGoodsShelfEntity goodsShelfEntity, BasicdataGoodsAllocationEntity goodsAllocationEntity) {
 		WarehouseUpdownStockupAreaEntity updownStockupAreaEntity = new WarehouseUpdownStockupAreaEntity();
 		updownStockupAreaEntity.setWarehouseId(warehouseId);
@@ -555,6 +675,29 @@ public class WarehouseUpdownStockupAreaServiceImpl extends BaseServiceImpl<Wareh
 	}
 
 
+	private  WarehouseUpdownStockupAreaEntity  createdNewUpShelfZeroOrder(Long allocationId, Long warehouseId,UpShelfZeroOrderDTO upShelfZeroOrderDTO, Long goodsAreaId, BasicdataGoodsAreaEntity goodsAreaEntity, Long goodsShelfId, BasicdataGoodsShelfEntity goodsShelfEntity, BasicdataGoodsAllocationEntity goodsAllocationEntity) {
+		WarehouseUpdownStockupAreaEntity updownStockupAreaEntity = new WarehouseUpdownStockupAreaEntity();
+		updownStockupAreaEntity.setWarehouseId(warehouseId);
+		updownStockupAreaEntity.setAreaId(goodsAreaId);
+		updownStockupAreaEntity.setAreaTitle(goodsAreaEntity.getHeadline());
+		updownStockupAreaEntity.setShelfId(goodsShelfId);
+		updownStockupAreaEntity.setShelfTitle(goodsShelfEntity.getGoodsShelfName());
+		updownStockupAreaEntity.setAllocationId(allocationId);
+		updownStockupAreaEntity.setAllocationTitle(goodsAllocationEntity.getGoodsAllocationName());
+		updownStockupAreaEntity.setPositionCode(goodsAllocationEntity.getQrCode());
+		updownStockupAreaEntity.setAssociationValue(upShelfZeroOrderDTO.getAssociationValue());
+		updownStockupAreaEntity.setAssociationId(Long.parseLong(upShelfZeroOrderDTO.getAssociationId()));
+		updownStockupAreaEntity.setAssociationType("1");
+		updownStockupAreaEntity.setUpdownType("订单");
+		updownStockupAreaEntity.setGoodsType("2");
+		updownStockupAreaEntity.setGoodsName(upShelfZeroOrderDTO.getGoodsName());
+		updownStockupAreaEntity.setNum(upShelfZeroOrderDTO.getEnterNum());
+		updownStockupAreaEntity.setMarketId(Long.parseLong(upShelfZeroOrderDTO.getMarketId()));
+		updownStockupAreaEntity.setMarketName(upShelfZeroOrderDTO.getMarketName());
+		return updownStockupAreaEntity;
+	}
+
+
 	private UpdownStockVO stockToUpdownStockVO(DistributionStockListEntity stockListEntity,Long warehouseId) {
 		Long marketId = stockListEntity.getMarketId();
 		//	Long materialId = stockListEntity.getMaterialId();