From 02744bacfa6eec9b7506c552fbe7a388ef1a6f79 Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080@qq.com>
Date: Wed, 31 Jan 2024 16:35:28 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=B7=A5=E5=8D=95=E7=9A=84=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AftersalesWorkOrderController.java           | 14 +++++++-------
 .../mapper/AftersalesCustomerMallMapper.xml      |  6 +++---
 .../impl/AftersalesWorkOrderServiceImpl.java     | 14 +++++++++++++-
 .../excel/DistributionBillInventoryExcel.java    | 16 ++++++++--------
 4 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java
index c0eca423f..c11ea6919 100644
--- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java
+++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java
@@ -124,14 +124,14 @@ public class AftersalesWorkOrderController extends BladeController {
 			IPage<AftersalesWorkOrderEntity> pages = aftersalesWorkOrderService.pageListOwn(aftersalesWorkOrder, Condition.getPage(query));
 
 			R<IPage<AftersalesWorkOrderVO>> data = R.data(AftersalesWorkOrderWrapper.build().pageVO(pages));
-			data.getData().getRecords().forEach(item -> {
-				BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
-				if (ObjectUtils.isNotNull(myCurrentWarehouse)){
+			BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
+			if (ObjectUtils.isNotNull(myCurrentWarehouse)){
+				data.getData().getRecords().forEach(item -> {
 					item.setTotalAmount(aftersalesCompletionRecordService.getTotalMoney(item,myCurrentWarehouse.getId()));
-					log.info("没有仓库信息");
+				});
+				}else{
+					log.info("查询人不属于某个仓库");
 				}
-
-			});
 			return data;
 		}catch (Exception e){
 			log.error("工单查询系统异常》》》{}",e.getMessage());
@@ -744,7 +744,7 @@ public class AftersalesWorkOrderController extends BladeController {
 	@ApiOperation(value = "写入财务入账时间", notes = "传入aftersalesWorkOrder")
 	public R updateFinanceTime(@Valid @RequestBody AftersalesWorkOrderVO  aftersalesWorkOrderVO ) {
 
-		if (aftersalesWorkOrderVO.getIds() == null || aftersalesWorkOrderVO.getIds()== ""){
+		if (aftersalesWorkOrderVO.getIds() != null || aftersalesWorkOrderVO.getIds()!= ""){
 			log.info("写入财务入账时间{},操作人{}",aftersalesWorkOrderVO.getEntryTime(),aftersalesWorkOrderVO.getOperator());
 			return R.data(aftersalesWorkOrderService.updateFinanceTime(aftersalesWorkOrderVO.getIds(),aftersalesWorkOrderVO.getEntryTime(),aftersalesWorkOrderVO.getOperator()));
 		}else {
diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesCustomerMallMapper.xml b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesCustomerMallMapper.xml
index e40df0497..df47137dc 100644
--- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesCustomerMallMapper.xml
+++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesCustomerMallMapper.xml
@@ -23,7 +23,7 @@
         SELECT *
         FROM `logpm_aftersales_customer_mall`
         WHERE client_id = #{clientId}
-          and is_deleted = 0 and types_of = 2
+          and is_deleted = 0 and types_of = 1
         order by create_time ASC
     </select>
 
@@ -41,7 +41,7 @@
 
     <select id="pageListOwn" resultType="com.logpm.aftersales.entity.AftersalesCustomerMallEntity">
 
-        select customer_service_id,customer_service_name,client_id,client_name,types_of,conditions from logpm_aftersales_customer_mall
+        select customer_service_id,customer_service_name,client_id,client_name,types_of,conditions,id,create_time from logpm_aftersales_customer_mall
         <where>
             is_deleted = 0 and types_of = #{param.typesOf}
             <if test="param.customerServiceId != null  and  param.customerServiceId != ''">and customer_service_id = #{param.customerServiceId}</if>
@@ -50,7 +50,7 @@
         </where>
     </select>
     <select id="getByClientId" resultType="com.logpm.aftersales.entity.AftersalesCustomerMallEntity">
-        select customer_service_id,customer_service_name,client_id,client_name,types_of,conditions
+        select customer_service_id,customer_service_name,client_id,client_name,types_of,conditions,id,create_time
         from logpm_aftersales_customer_mall
         where client_id = #{clientId}
           and is_deleted = 0
diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java
index 33186f1db..b9167d46c 100644
--- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java
+++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java
@@ -692,9 +692,21 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 						if( ObjectUtils.isNotNull( workOrderStatus ) && "500".equals(workOrderStatus)){
 							aftersalesWorkOrder.remove("workOrderStatus");
 							aftersalesWorkOrder.put("customerServiceState","30");
-						}else if(ObjectUtils.isNotNull( workOrderStatus ) && WorkOrderStatusConstant.yiwanjei.getValue().equals(workOrderStatus)) {
+						}else if(ObjectUtils.isNotNull( workOrderStatus ) && WorkOrderStatusConstant.daichuli.getValue().equals(workOrderStatus)) {
+							aftersalesWorkOrder.remove("workOrderStatus");
+							aftersalesWorkOrder.put("customerServiceState","20");
+							aftersalesWorkOrder.put("customerServiceState","10");
+							aftersalesWorkOrder.put("customerServiceState","40");
+							aftersalesWorkOrder.put("customerServiceState","60");
+							aftersalesWorkOrder.put("customerServiceState","100");
+							aftersalesWorkOrder.put("customerServiceState","21");
+						}
+						else if(ObjectUtils.isNotNull( workOrderStatus ) && WorkOrderStatusConstant.yiwanjei.getValue().equals(workOrderStatus)) {
 							aftersalesWorkOrder.remove("workOrderStatus");
 							aftersalesWorkOrder.put("customerServiceState","10");
+						}else if (ObjectUtils.isNotNull( workOrderStatus ) && WorkOrderStatusConstant.daishenhe.getValue().equals(workOrderStatus)){
+							aftersalesWorkOrder.remove("workOrderStatus");
+							aftersalesWorkOrder.put("customerServiceState","40");
 						}else if( ObjectUtils.isNull( workOrderStatus ) ){
 							aftersalesWorkOrder.put("customerIdentification", "1");
 						}
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionBillInventoryExcel.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionBillInventoryExcel.java
index 8de4bb278..2cb28501a 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionBillInventoryExcel.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionBillInventoryExcel.java
@@ -23,18 +23,18 @@ public class DistributionBillInventoryExcel {
 	@ColumnWidth(20)
 	@ExcelProperty("物料名称")
 	private String descriptionGoods;
-//	@ColumnWidth(20)
-//	@ExcelProperty("备货数")
-//	private String quantity;
+	@ColumnWidth(20)
+	@ExcelProperty("备货数")
+	private String quantity;
 	@ColumnWidth(20)
 	@ExcelProperty("已备数量")
 	private String preparedQuantity;
 	@ColumnWidth(20)
 	@ExcelProperty("物料编号")
 	private String cargoNumber;
-	@ColumnWidth(20)
-	@ExcelProperty("应提件数")
-	private String quantity; //数量
+//	@ColumnWidth(20)
+//	@ExcelProperty("应提件数")
+//	private String quantity; //数量
 	@ColumnWidth(20)
 	@ExcelProperty("备货状态")
 	private Integer stockStatus;
@@ -47,9 +47,9 @@ public class DistributionBillInventoryExcel {
 	@ColumnWidth(20)
 	@ExcelProperty("单位")
 	private String cargoUnit; //单位
-	/**@ColumnWidth(20)
+	@ColumnWidth(20)
 	@ExcelProperty("托盘码")
-*/
+	private String pallet;
 	@ColumnWidth(20)
 	@ExcelProperty("库位信息")
 	private String allocation;