From 6a82d212d86fa59c528654dba95382c6507cc591 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Wed, 17 Jan 2024 18:46:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E7=AD=BE=E6=94=B6=E8=A1=A5?=
 =?UTF-8?q?=E5=BD=95=E7=8A=B6=E6=80=81=E7=BB=B4=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/logpm/basic/app/BasicMaterielPDAlController.java   | 7 +++++++
 .../service/impl/DistributionSignforServiceImpl.java       | 5 +++++
 2 files changed, 12 insertions(+)

diff --git a/blade-service/logpm-basic/src/main/java/com/logpm/basic/app/BasicMaterielPDAlController.java b/blade-service/logpm-basic/src/main/java/com/logpm/basic/app/BasicMaterielPDAlController.java
index 19bf6c8f4..384606b15 100644
--- a/blade-service/logpm-basic/src/main/java/com/logpm/basic/app/BasicMaterielPDAlController.java
+++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/app/BasicMaterielPDAlController.java
@@ -16,6 +16,7 @@ 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.springblade.core.tool.utils.SpringUtil;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
@@ -38,6 +39,9 @@ public class BasicMaterielPDAlController {
 		if (Func.isEmpty(tenantId)){
 			return null;
 		}
+		if (Func.isEmpty(basicMaterialService)){
+			basicMaterialService = SpringUtil.getBean(IBasicMaterialService.class);
+		}
 		LambdaQueryWrapper<BasicMaterialEntity> apply = Wrappers.<BasicMaterialEntity>query().lambda()
 			.eq(BasicMaterialEntity::getTenantId, tenantId);
 
@@ -62,6 +66,9 @@ public class BasicMaterielPDAlController {
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "PDA维护物料信息", notes = "DistributionStockListVO")
 	private R updateMateriel(@Valid @RequestBody BasicMaterialEntity basicMaterial){
+		if (Func.isEmpty(basicMaterialService)){
+			basicMaterialService = SpringUtil.getBean(IBasicMaterialService.class);
+		}
 		boolean flag = basicMaterialService.updateById(basicMaterial);
 		return R.status(flag);
 	}
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
index ed39b3534..3bd646409 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
@@ -1782,6 +1782,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						distributionLoadscanEntity.setOrderId(parcelListEntity.getStockArticleId());
 						distributionLoadscanEntity.setReservationId(distrilbutionloadingscanDTO.getReservationId());
 						distributionLoadscanEntity.setDeliveryId(distrilbutionloadingscanDTO.getDeliveryId());
+						distributionLoadscanEntity.setScanStatus(LoadingStatusConstant.buluzhuangche.getValue());
 						distributionLoadscanEntity.setScanUser(AuthUtil.getUser().getNickName());
 						distributionLoadscanEntity.setSigningUser(AuthUtil.getUser().getNickName());
 						distributionLoadscanEntity.setSigningUserId(AuthUtil.getUser().getUserId());
@@ -1850,8 +1851,12 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						distributionLoadscanEntity.setReservationId(distrilbutionloadingscanDTO.getReservationId());
 						distributionLoadscanEntity.setDeliveryId(distrilbutionloadingscanDTO.getDeliveryId());
 						distributionLoadscanEntity.setScanUser(AuthUtil.getUser().getUserName());
+						distributionLoadscanEntity.setScanStatus(LoadingStatusConstant.buluzhuangche.getValue());
 						distributionLoadscanEntity.setSigningUser(AuthUtil.getUser().getUserName());
 						distributionLoadscanEntity.setSigningUserId(AuthUtil.getUser().getUserId());
+						distributionLoadscanEntity.setIsAbnormalLoading(2);
+						distributionLoadscanEntity.setIsAbnormalSigning(2);
+						distributionLoadscanEntity.setAbnormalNote("异常签收");
 						if (Func.isEmpty(loadscanEntity)){
 							distributionLoadscanService.save(distributionLoadscanEntity);
                         }else {