Merge branch 'dev' into pre-production

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

@@ -137,7 +137,7 @@ public class AftersalesReturnRecordController extends BladeController {
 		if(aftersalesReturnRecord.getProcessorList().isEmpty()){
 			return R.fail("请选择打回的营业部！");
 		}
-		aftersalesReturnRecord.setTypesOf(ReturnRecordTypesOfStatusConstant.yibandahui.getValue());
+//		aftersalesReturnRecord.setTypesOf(ReturnRecordTypesOfStatusConstant.yibandahui.getValue());
 		return R.status(aftersalesReturnRecordService.batchRepulse(aftersalesReturnRecord));
 	}
 

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

@@ -31,6 +31,7 @@ import lombok.AllArgsConstructor;
 import org.springblade.common.constant.aftersales.ProcessorConditionsStatusConstant;
 import org.springblade.common.constant.aftersales.ProcessorProcessingStatusStatusConstant;
 import org.springblade.common.constant.aftersales.ProcessorTypesOfStatusConstant;
+import org.springblade.common.constant.aftersales.ReturnRecordTypesOfStatusConstant;
 import org.springblade.common.constant.aftersales.WorkOrderStatusConstant;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.secure.BladeUser;
@@ -180,7 +181,11 @@ public class AftersalesReturnRecordServiceImpl extends BaseServiceImpl<Aftersale
 				//修改异常工单的状态
 				AftersalesWorkOrderEntity workOrderEntity = new AftersalesWorkOrderVO();
 				workOrderEntity.setId(i);
-				workOrderEntity.setWorkOrderStatus(WorkOrderStatusConstant.daichuli.getValue());
+				if(ObjectUtil.equal(aftersalesReturnRecord.getTypesOf(), ReturnRecordTypesOfStatusConstant.yibandahui.getValue())){
+					workOrderEntity.setWorkOrderStatus(WorkOrderStatusConstant.lipeijineweichu.getValue());
+				}else if(ObjectUtil.equal(aftersalesReturnRecord.getTypesOf(), ReturnRecordTypesOfStatusConstant.wanjeidahui.getValue())){
+					workOrderEntity.setWorkOrderStatus(WorkOrderStatusConstant.yichuli.getValue());
+				}
 				aftersalesWorkOrderService.updateById(workOrderEntity);
 				AftersalesReturnRecordEntity returnRecordEntity = new AftersalesReturnRecordEntity();
 				BeanUtil.copyProperties(aftersalesReturnRecord,returnRecordEntity);

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

@@ -1750,14 +1750,14 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 		}
 		//添加处理结果
 		AftersalesProcessingResultsDTO aftersalesProcessingResultsDTO = aftersalesWorkOrderDTO.getAftersalesProcessingResultsDTO();
-		if (ObjectUtils.isNotNull(aftersalesWorkOrderDTO.getId())) {
 			aftersalesProcessingResultsDTO.setWorkOrderId(aftersalesWorkOrderDTO.getId());
-			aftersalesProcessingResultsDTO.setCreateUser(user.getUserId());
+//		if (ObjectUtils.isNotNull(aftersalesWorkOrderDTO.getId())) {
-			aftersalesProcessingResultsDTO.setCreateDept(Long.valueOf(user.getDeptId()));
+//			aftersalesProcessingResultsDTO.setCreateUser(user.getUserId());
-			aftersalesProcessingResultsDTO.setCreateTime(new Date());
+//			aftersalesProcessingResultsDTO.setCreateDept(Long.valueOf(user.getDeptId()));
-			aftersalesProcessingResultsDTO.setStatus(1);
+//			aftersalesProcessingResultsDTO.setCreateTime(new Date());
-			aftersalesProcessingResultsDTO.setIsDeleted(0);
+//			aftersalesProcessingResultsDTO.setStatus(1);
-		}
+//			aftersalesProcessingResultsDTO.setIsDeleted(0);
+//		}
 		aftersalesProcessingResultsService.ownSaveOrUpdate(aftersalesProcessingResultsDTO);
 		//修改异常工单处理信息！
 		AftersalesWorkOrderEntity workOrderEntity = new AftersalesWorkOrderEntity();

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionBillLadingAppController.java

@@ -141,6 +141,7 @@ public class DistributionBillLadingAppController extends BladeController {
 			if("2".equals(type)){
 				BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
 				String coding = distrilbutionBillLading.get("coding").toString();
+
 				warehouseUpdownTypeClient.downPackageOrDelTray(coding, myCurrentWarehouse.getId(),"签收下架解托");
 			}else if("1".equals(type)){
 				//todo 这里需要增加对备货库存品的下架逻辑  但是备货是会进行下架的

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

@@ -95,11 +95,8 @@
         ldsl.tray_name trayName, lds.allocation_title allocation,
         lddd.reality_quantity preparedQuantity,
         lddd.stock_status,
-        (SELECT count(id) FROM logpm_distribution_bill_lading_scan ldbls WHERE ldbls.stock_list_id = lddd.stock_list_id and ldbls.material_type = 1 and
+        (SELECT count(id) FROM logpm_distribution_bill_lading_scan ldbls WHERE ldbls.bill_lading_id = lddd.bill_lading_id AND  ldbls.stock_list_id = lddd.stock_list_id and ldbls.material_type = 1 and ldbls.scan_type=1 ) AS pickUpQuantity,
-        ldbls.bill_lading_id=#{param.billLadingId}
-        ) AS pick_up_quantity,
         CASE
-
         WHEN ( SELECT count( id ) FROM logpm_distribution_bill_lading_scan ldbls WHERE ldbls.stock_list_id = lddd.stock_list_id AND ldbls.material_type = 1 ) = 0 THEN
         '待提货'
         WHEN lddd.quantity - ( SELECT count( id ) FROM logpm_distribution_bill_lading_scan ldbls WHERE ldbls.stock_list_id = lddd.stock_list_id AND ldbls.material_type = 1 ) > 0 THEN

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

@@ -156,7 +156,6 @@
         logpm_distrilbution_bill_lading  AS ldbl
         LEFT JOIN logpm_distrilbution_bill_stock ldbs  ON ldbs.bill_lading_id = ldbl.id
         LEFT JOIN logpm_distribution_stock_article ldsa on ldbs.stock_article_id = ldsa.id
-<!--        LEFT JOIN logpm_distribution_stock lds on lds.stock_article = ldbs.stock_article_id-->
         LEFT JOIN logpm_distribution_bill_lading_scan AS ldbls ON ldbl.id = ldbls.bill_lading_id
         <where>
             ldbs.is_deleted = 0 and  ldbs.bill_lading_id = #{param.billLadingId}  and ldbs.order_status in (1,3)

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

@@ -2973,7 +2973,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 		try{
 			Object billLadingId = distrilbutionBillLading.get("id"); //提货ID
 			Object coding = distrilbutionBillLading.get("coding"); //包条码
-			Object type = distrilbutionBillLading.get("type"); //类型 2 订单  1 库存品
+			Object type = distrilbutionBillLading.get("type"); //类型 2 订制品包件  1 库存品
 			if (Func.isNull(billLadingId) || ObjectUtil.isEmpty(coding) || Func.isNull(type)) {
 				return Resp.scanFail("3000", "参数不完整！！");
 			} else {
@@ -3202,7 +3202,6 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 									int i2 = ObjectUtils.isNull(one.getSigninQuantity()) ? 1 : one.getSigninQuantity() + 1;
 									one.setHandQuantity(i);
 									one.setSigninQuantity(i2);
-
 								}
 
 								// 修改订单状态
@@ -3232,7 +3231,6 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 				String a = String.valueOf(billLadingId);
 				distributionAsyncService.getStockUPstate(Long.parseLong(a));
 
-
 				log.info(coding + " > > 签收成功!!");
 				return Resp.scanSuccess("签收成功", "签收成功");
 			}