商配异常签收BUG修复

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

@@ -2610,6 +2610,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 
 					loadscanEntity.setSigningUser(nickName);
 					loadscanEntity.setSigningUserId(userId);
+					loadscanEntity.setSignforType(LoadScanSigningTypeStatusConstant.sijiqianshou.getValue());
 
 
 					distributionLoadscanService.updateById(loadscanEntity);
@@ -2680,6 +2681,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					distributionLoadscanEntity.setOneClick(1);
 					distributionLoadscanEntity.setOneQclick(1);
 					distributionLoadscanEntity.setIsInsert(2);
+					distributionLoadscanEntity.setSignforType(LoadScanSigningTypeStatusConstant.sijiqianshou.getValue());
 					distributionLoadscanEntity.setTrainNumber(deliveryListEntity.getTrainNumber());
 					distributionLoadscanEntity.setPackageNub(collect.get(0).getQuantity());
 					distributionLoadscanEntity.setOrderId(collect.get(0).getStockArticleId());
@@ -3394,7 +3396,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						jsonObjects.add(jsonObject);
 						warehouseUpdownStockUpAreaClient.downStockUpShelf(jsonObjects);
 //				Integer j = distributionSignforMapper.updateSignforNum(distributionLoadscanEntity.getDeliveryId(), distributionLoadscanEntity.getReservationId(), distributionLoadscanEntity.getPackageNub());
-						if (Func.isEmpty(loadscanEntity)) {
+						if (Func.isEmpty(loadscanEntity.getId())) {
 							//更新装车包件数和签收包件数
 							distributionLoadscanService.save(distributionLoadscanEntity);
 							loadingId = distributionLoadscanEntity.getId();
@@ -3407,9 +3409,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						}
 						JSONObject trunklinePackageTrackLog = handleLogJSONObject(myCurrentWarehouse, AuthUtil.getUser(), parcelListEntity.getOrderPackageCode(), content, WorkNodeEnums.DISTRIBUTION_ABNORMAL_SIGN_FOR.getCode(), distributionDeliveryListEntity.getTrainNumber(), parcelListEntity.getWarehouseEntryTimeEnd());
 						aaa.add(trunklinePackageTrackLog);
-						assert loadscanEntity != null;
 
-					} else {
+                    } else {
 						return Resp.scanFail("操作失败", "不属于该客户");
 					}