Merge branch 'dev' into pre-production

blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java

@@ -8,7 +8,7 @@ public interface ModuleNameConstant {
 	/**
 	 * 如果不需要 ""
 	 */
-	public static final String DEVAUTH ="-zhy";
+	public static final String DEVAUTH ="";
 
 	/**
 	 * 工厂对接服务名称

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppStockArticleVO.java

@@ -119,6 +119,12 @@ public class DistributionAppStockArticleVO extends DistributionStockArticleEntit
 	@ApiModelProperty(value = "单位")
 	private String logpmUnit;
 
+	/**
+	 * 包件码
+	 */
+	@ApiModelProperty(value = "包件码")
+	private String orderPackageCode;
+
 	@ApiModelProperty(value = "订单包件集合")
 	private List<DistributionAppParcelListVO> distributionAppParcelListVOS;
 

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java

@@ -18,6 +18,7 @@ package com.logpm.aftersales.controller;
 
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.logpm.aftersales.dto.AftersalesWorkOrderDTO;
+import com.logpm.aftersales.excel.AftersalesWorkOrderImporter;
 import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
 import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
 import io.swagger.annotations.Api;
@@ -43,6 +44,7 @@ import com.logpm.aftersales.service.IAftersalesWorkOrderService;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.excel.util.ExcelUtil;
+import org.springframework.web.multipart.MultipartFile;
 import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.Map;
@@ -172,10 +174,10 @@ public class AftersalesWorkOrderController extends BladeController {
 	/**
 	 * 客服异常工单 查询处理结果信息数据
 	 */
-	@PostMapping("/getProcessingResults")
+	@GetMapping("/getProcessingResults")
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "客服异常工单 查询处理结果信息数据", notes = "传入aftersalesWorkOrder")
-	public R getProcessingResults(@Valid @RequestBody AftersalesWorkOrderDTO  aftersalesWorkOrder) {
+	public R getProcessingResults(AftersalesWorkOrderDTO  aftersalesWorkOrder) {
 		if(ObjectUtils.isNull(aftersalesWorkOrder.getId())){
 			return R.fail("异常工单ID不能为空！！");
 		}
@@ -260,5 +262,19 @@ public class AftersalesWorkOrderController extends BladeController {
 		ExcelUtil.export(response, "异常工单数据" + DateUtil.time(), "异常工单数据", list, AftersalesWorkOrderExcel.class);
 	}
 
+	/**
+	 * 导入 批量修改 钉钉流程号、审核人、审核日期，财务理赔入账日期、操作人
+	 */
+	@PostMapping("/import-aftersalesWorkOrder")
+	@ApiOperationSupport(order = 12)
+	@ApiOperation(value = "批量修改 钉钉流程号、审核人、审核日期，财务理赔入账日期、操作人", notes = "传入excel")
+	public R importWarehousingEntry(MultipartFile file, Integer isCovered) {
+		isCovered = 1;
+		AftersalesWorkOrderImporter userImporter = new AftersalesWorkOrderImporter(aftersalesWorkOrderService, isCovered == 1);
+		ExcelUtil.save(file, userImporter, AftersalesWorkOrderExcel.class);
+		return R.success("操作成功");
+	}
+
+
 
 }

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/excel/AftersalesWorkOrderImporter.java

@@ -0,0 +1,17 @@
+package com.logpm.aftersales.excel;
+
+import com.logpm.aftersales.service.IAftersalesWorkOrderService;
+import lombok.RequiredArgsConstructor;
+import org.springblade.core.excel.support.ExcelImporter;
+
+import java.util.List;
+
+@RequiredArgsConstructor
+public class AftersalesWorkOrderImporter implements ExcelImporter<AftersalesWorkOrderExcel> {
+	private final IAftersalesWorkOrderService service;
+	private final Boolean isCovered;
+	@Override
+	public void save(List<AftersalesWorkOrderExcel> data) {
+		service.importUser(data, isCovered);
+	}
+}

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

@@ -67,4 +67,6 @@ public interface AftersalesWorkOrderMapper extends BaseMapper<AftersalesWorkOrde
 	 * @return
 	 */
     IPage<AftersalesWorkOrderEntity> pageListOwn(IPage<Object> page,@Param("param") AftersalesWorkOrderEntity workOrderEntity);
+
+	boolean updateList(@Param("list") List<AftersalesWorkOrderEntity> list);
 }

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

@@ -57,6 +57,23 @@
         from logpm_aftersales_work_order lawo
 
     </select>
+    <update id="updateList">
+      <foreach collection="list" separator=";" close="" index="index" item="item" open="">
+        update logpm_aftersales_work_order
+        <set>
+            <if test="item.processNumber != null and item.processNumber != ''"> process_number = #{item.processNumber }, </if>
+            <if test="item.reviewedBy != null and item.reviewedBy != ''">reviewed_by = #{item.reviewedBy }, </if>
+            <if test="item.auditTime != null">audit_time = #{item.auditTime }, </if>
+            <if test="item.entryTime != null "> entry_time= #{item.entryTime }, </if>
+            <if test="item.operator != null and item.operator != ''"> operator= #{item.operator }, </if>
+        </set>
+          WHERE `id` = #{ item.id }
+      </foreach>
+
+
+    </update>
+
+
     <select id="selectAftersalesWorkOrderPage" resultMap="aftersalesWorkOrderResultMap">
         select * from logpm_aftersales_work_order where is_deleted = 0
     </select>
@@ -74,7 +91,7 @@
         from logpm_aftersales_processor lap
         LEFT JOIN logpm_aftersales_work_order law on lap.work_order_id = law.id
         <where>
-            lap.conditions != '3' and lap.is_deleted = 0
+            lap.conditions != '3' and lap.is_deleted = 0 and law.id is not null
             <if test="param.workOrderStatus != null and param.workOrderStatus != ''">and  law.work_order_status = #{param.work_order_status}</if>
             <if test="param.warehouseId != null and param.warehouseId != ''">and  lap.business_id = #{param.warehouseId}</if>
         </where>

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesWorkOrderService.java

@@ -122,4 +122,11 @@ public interface IAftersalesWorkOrderService extends BaseService<AftersalesWorkO
 	 * @return
 	 */
 	Boolean addWorkOrder(AftersalesWorkOrderDTO aftersalesWorkOrderDTO);
+
+	/**
+	 *导入 批量修改 钉钉流程号、审核人、审核日期，财务理赔入账日期、操作人
+	 * @param data
+	 * @param isCovered
+	 */
+	void importUser(List<AftersalesWorkOrderExcel> data, Boolean isCovered);
 }

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

@@ -494,7 +494,6 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 
 		}
 
-
 		return aftersalesWorkOrderVO;
 	}
 
@@ -526,4 +525,37 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 		return saveOrUpdateOwn(aftersalesWorkOrderDTO);
 	}
 
+	/**
+	 * 导入 批量修改 钉钉流程号、审核人、审核日期，财务理赔入账日期、操作人
+	 * @param data
+	 * @param isCovered
+	 */
+	@Override
+	public void importUser(List<AftersalesWorkOrderExcel> data, Boolean isCovered) {
+		if(!data.isEmpty()){
+			BladeUser user = AuthUtil.getUser();
+
+			List<AftersalesWorkOrderEntity> list= new ArrayList<>();
+			data.stream().forEach( k ->{
+					//查询工单数据是否存在
+				AftersalesWorkOrderEntity workOrder = baseMapper.selectOne(Wrappers.<AftersalesWorkOrderEntity>query().lambda()
+					.eq(AftersalesWorkOrderEntity::getWorkOrderNumber, k)
+				);
+				    if(ObjectUtils.isNull(workOrder)){
+						throw new ServiceException(k+"不存在！！请确定！！");
+					}
+					AftersalesWorkOrderEntity workOrderEntity = new AftersalesWorkOrderEntity();
+					BeanUtil.copyProperties(k,workOrderEntity);
+					if(ObjectUtils.isNotNull( k.getEntryTime())){
+						workOrderEntity.setOperator(user.getUserName());
+					}
+					workOrderEntity.setId(workOrder.getId());
+					list.add(workOrderEntity);
+			});
+			if(!list.isEmpty()){
+				baseMapper.updateList(list);
+			}
+		}
+	}
+
 }

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

@@ -1196,8 +1196,8 @@
 
         select ldr.* from logpm_distribution_reservation ldr
         where ldr.delivery_type=2
-        <if test="distrbutionReservation.distrbutionReservation != null">
-           and ldr.reservation_status = #{distrbutionReservation.distrbutionReservation}
+        <if test="distrbutionReservation.reservationStatus != null">
+           and ldr.reservation_status = #{distrbutionReservation.reservationStatus}
         </if>
         <if test="distrbutionReservation.clientIds != null">
             and ldr.mall_id in

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

@@ -308,16 +308,16 @@
         lddl.vehicle_name vehicleName,
         lddl.task_time taskTime,
         lddl.loading_time  AS signLoadingDate,
-        lds.received_quantity receivedQuantity,
+        (lds.received_quantity+receivedin_quantity) receivedQuantity,
         lds.examine_user_id examineUserId,
         lds.examine_user_name examineUserName,
         ldr.delivery_phone deliveryPhone,
         ldr.reservation_code reservationCode,
         ldr.delivery_address deliveryAddress,
         lds.delivery_sign_pictures deliverySignPictures,
-        ldr.reservation_num reservationNum,
+        (ldr.reservation_num + ldr.reservation_stock_list_num) reservationNum,
         lds.driver_signing driverSigning,
-        lds.loaded_number loadedNumber,
+        (lds.loaded_number+lds.loadedin_number) loadedNumber,
          lds.create_time   createTime,
         CASE  WHEN lds.signing_status ='2' THEN '文员签收'
           WHEN lds.driver_signing ='2' THEN '司机签收'
@@ -332,8 +332,8 @@
         ELSE '待签收'
         END sijiSigningStatus,
         lds.signing_status,
-        ldr.reservation_num - lds.received_quantity unsigneds,
-        ldr.reservation_num - lds.loaded_number withoutScanning,
+        (ldr.reservation_num + ldr.reservation_stock_list_num) - (lds.received_quantity+receivedin_quantity) unsigneds,
+        (ldr.reservation_num + ldr.reservation_stock_list_num) - (lds.loaded_number+lds.loadedin_number) withoutScanning,
         lds.reservation_id reservationId,
         CASE lddl.kind
         WHEN '1' THEN (SELECT driver_phone FROM logpm_distribution_delivery_self AS ldds WHERE ldds.delivery_id= lddl.id   AND ldds.is_deleted = 0 AND ldds.is_master = 2)

blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java

@@ -514,13 +514,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 				}
 			} else {
 				//todo 更新数据 对这个 advanceEntity 这个进行属性设置 调用对象的更新方法
-
-
 				// 更新bap
-
-
-
-
 				log.info(">>>>>>>>>>>更新订单信息已在老系统存在");
 			}