修改语言返回

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

@@ -0,0 +1,51 @@
+package org.springblade.common.constant.pda;
+
+public enum PdaAudioLingoStatus {
+
+	saomiaochenggong("扫码成功","1"),
+	chongfusaomiao("重复扫描","2"),
+	baojianbucunzai("包件信息不存在","3"),
+	caozuoshibai("操作失败","4"),
+	cuanhuo("窜货","5"),
+	yiwancheng("已完成","6"),
+	baotiaomabucunzai("包条码不存在","7"),
+	baotiaomayishiyong("条码已使用","8"),
+	meiyou("没有待绑定的库存品信息","9"),
+	buzai("扫描到不是本次拣货计划的包件","10"),
+	yuyuebuzai("预约信息不存在","11"),
+	weizhicuowu("未知错误","100");
+
+
+
+	/**
+	 * 状态
+	 */
+	private String name;
+
+	/**
+	 * 值
+	 */
+	private String value;
+
+
+	private PdaAudioLingoStatus(String name, String value) {
+		this.name = name;
+		this.value = value;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getValue() {
+		return value;
+	}
+
+	public void setValue(String value) {
+		this.value = value;
+	}
+}

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

@@ -43,6 +43,7 @@ import lombok.extern.log4j.Log4j2;
 import org.redisson.api.RLock;
 import org.springblade.common.constant.DictBizConstant;
 import org.springblade.common.constant.RabbitConstant;
+import org.springblade.common.constant.pda.PdaAudioLingoStatus;
 import org.springblade.common.constant.stockup.StockupStatusConstant;
 import org.springblade.common.constant.stockup.StockupTypeStatusConstant;
 import org.springblade.common.utils.CommonUtil;
@@ -534,8 +535,8 @@ public class DistributionStockupAppController extends BladeController {
 		String lockKey = stockupDTO.getPacketBarCode()+stockupDTO.getStockupId();
 		RLock lock = new RedissonConfig().redisson().getLock(lockKey);
 		if(lock.isLocked()){
-			String audioValue2 = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, "2");
+			String audioValue2 = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, PdaAudioLingoStatus.chongfusaomiao.getValue());
-			return Resp.scanFail("重复扫描！", audioValue2);
+			return Resp.scanFail(PdaAudioLingoStatus.chongfusaomiao.getName(), audioValue2);
 		}
 		lock.lock(5, TimeUnit.SECONDS);
 			if (scanType == 1) {
@@ -629,31 +630,31 @@ public class DistributionStockupAppController extends BladeController {
 						//将消息携带绑定键值
 						rabbitTemplate.convertAndSend(RabbitConstant.STOCKUP_STATE_UPDATE_EXCHANGE, RabbitConstant.STOCKUP_STATE_UPDATE_ROUTING, mapState);
 
-						String audioValue = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, "1");
+						String audioValue = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, PdaAudioLingoStatus.saomiaochenggong.getValue());
 
 						//查询是否货位数据是否该下架
 //					distributionAsyncService.stockupSelfOffShelf(stockupDTO);
-						return Resp.scanSuccess("扫描成功！", audioValue);
+						return Resp.scanSuccess(PdaAudioLingoStatus.saomiaochenggong.getName(), audioValue);
 					case 2:
 						//重复扫描
-						String audioValue2 = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, "2");
+						String audioValue2 = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, PdaAudioLingoStatus.chongfusaomiao.getValue());
-						return Resp.scanFail("重复扫描！", audioValue2);
+						return Resp.scanFail(PdaAudioLingoStatus.chongfusaomiao.getName(), audioValue2);
 					case 3:
 						//包件不存在
-						String audioValue3 = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, "3");
+						String audioValue3 = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, PdaAudioLingoStatus.baotiaomabucunzai.getValue());
-						return Resp.scanFail("包件不存在！", audioValue3);
+						return Resp.scanFail(PdaAudioLingoStatus.baotiaomabucunzai.getName(), audioValue3);
 
 					case 4:
 						//操作失败
-						String audioValue4 = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, "4");
+						String audioValue4 = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, PdaAudioLingoStatus.caozuoshibai.getValue());
-						return Resp.scanFail("操作失败！", audioValue4);
+						return Resp.scanFail(PdaAudioLingoStatus.caozuoshibai.getName(), audioValue4);
 					case 5:
 						//窜货
-						String audioValue5 = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, "5");
+						String audioValue5 = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, PdaAudioLingoStatus.buzai.getValue());
-						return Resp.scanFail("窜货！", audioValue5);
+						return Resp.scanFail(PdaAudioLingoStatus.buzai.getName(), audioValue5);
 					default:
 						log.warn("###备货扫描：未知错误");
-						return Resp.scanFail("未知错误！", "未知错误");
+						return Resp.scanFail(PdaAudioLingoStatus.weizhicuowu.getName(), PdaAudioLingoStatus.weizhicuowu.getName());
 				}
 
 			} else if (scanType == 2) {
@@ -752,7 +753,7 @@ public class DistributionStockupAppController extends BladeController {
 											R r = warehouseUpdownTypeClient.downStock(list);
 											log.debug("下架状态：{}",r.getMsg());
 										}else{
-											return R.fail(3002,"本货位的物料已为0，请更换货位继续！！");
+											return Resp.scanFail("本货位的物料已为0，请更换货位继续！！","本货位的物料已为0，请更换货位继续！！");
 										}
 								}else{
 									return Resp.scanFail("物料信息查询失败，请联系管理员！！", "物料信息查询失败，请联系管理员！！");
@@ -770,49 +771,50 @@ public class DistributionStockupAppController extends BladeController {
 								map.put("createTime", new Date().getTime());
 								//将消息携带绑定键值
 								rabbitTemplate.convertAndSend(RabbitConstant.STOCKUP_SCAN_EXCHANGE, RabbitConstant.STOCKUP_SCAN_ROUTING, map);
-								String audioValue = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, "1");
+								String audioValue = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, PdaAudioLingoStatus.saomiaochenggong.getValue());
-								return Resp.scanSuccess("扫描成功！",audioValue);
+								//扫码成功
+								return Resp.scanSuccess(PdaAudioLingoStatus.saomiaochenggong.getName(),audioValue);
 							case 2:
-								//扫码失败
+								//重复扫描
-								String audioValue2 = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, "2");
+								String audioValue2 = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, PdaAudioLingoStatus.chongfusaomiao.getValue());
-								return Resp.scanFail("重复扫描！",audioValue2);
+								return Resp.scanFail(PdaAudioLingoStatus.chongfusaomiao.getName(),audioValue2);
 							case 3:
-								//重复扫码
+								//包件不存在
-								String audioValue3 = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, "3");
+								String audioValue3 = DictBizCache.getValue(DictBizConstant.PDA_AUDIO,PdaAudioLingoStatus.baojianbucunzai.getValue() );
-								return Resp.scanFail("包件不存在！",audioValue3);
+								return Resp.scanFail(PdaAudioLingoStatus.baojianbucunzai.getName(),audioValue3);
 
 							case 4:
-								//重复扫码
+								//操作失败
-								String audioValue4 = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, "4");
+								String audioValue4 = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, PdaAudioLingoStatus.caozuoshibai.getValue());
-								return Resp.scanFail("操作失败！", audioValue4);
+								return Resp.scanFail(PdaAudioLingoStatus.caozuoshibai.getName(), audioValue4);
 							case 5:
-								//重复扫码
+								//窜货
-								String audioValue5 = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, "5");
+								String audioValue5 = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, PdaAudioLingoStatus.cuanhuo.getValue());
-								return Resp.scanFail("窜货！", audioValue5);
+								return Resp.scanFail(PdaAudioLingoStatus.cuanhuo.getName(), audioValue5);
 							case 6:
-								//重复扫码
+								//已完成
-								String audioValue6 = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, "6");
+								String audioValue6 = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, PdaAudioLingoStatus.yiwancheng.getValue());
-								return Resp.scanFail("已完成！", audioValue6);
+								return Resp.scanFail(PdaAudioLingoStatus.yiwancheng.getName(), audioValue6);
 							case 7:
-								//重复扫码
+								//包条码不存在
-								String audioValue7 = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, "7");
+								String audioValue7 = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, PdaAudioLingoStatus.baotiaomabucunzai.getValue());
-								return Resp.scanFail("包条码不存在！", audioValue7);
+								return Resp.scanFail(PdaAudioLingoStatus.baotiaomabucunzai.getName(), audioValue7);
 							default:
 								log.warn("###备货扫描：未知错误");
-								return Resp.scanFail("未知错误！", "未知错误");
+								return Resp.scanFail(PdaAudioLingoStatus.weizhicuowu.getName(), PdaAudioLingoStatus.weizhicuowu.getName());
 						}
 					case 7:
-						//重复扫码
+						//包条码不存在
-						String audioValue7 = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, "7");
+						String audioValue7 = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, PdaAudioLingoStatus.baotiaomabucunzai.getValue());
-						return Resp.scanFail("包条码不存在！", audioValue7);
+						return Resp.scanFail(PdaAudioLingoStatus.baotiaomabucunzai.getName(), audioValue7);
 					case 8:
-						//重复扫码
+						//条码已使用
-						String audioValue8 = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, "8");
+						String audioValue8 = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, PdaAudioLingoStatus.baotiaomayishiyong.getValue());
-						return Resp.scanFail("条码已使用！", audioValue8);
+						return Resp.scanFail(PdaAudioLingoStatus.baotiaomayishiyong.getName(), audioValue8);
 					case 9:
-						//重复扫码
+						//"没有待绑定的库存品信息！"
-						String audioValue9 = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, "9");
+						String audioValue9 = DictBizCache.getValue(DictBizConstant.PDA_AUDIO, PdaAudioLingoStatus.meiyou.getValue());
-						return Resp.scanFail("没有待绑定的库存品信息！", audioValue9);
+						return Resp.scanFail(PdaAudioLingoStatus.meiyou.getName(), audioValue9);
 				}
 
 

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

@@ -49,6 +49,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.constant.CodeDesEnum;
 import org.springblade.common.constant.DictBizConstant;
 import org.springblade.common.constant.orderpackage.OrderPackageStockupStatusConstant;
+import org.springblade.common.constant.pda.PdaAudioLingoStatus;
 import org.springblade.common.constant.stocklist.StockLockingStatusConstant;
 import org.springblade.common.constant.stocklist.StockSignfoStatusConstant;
 import org.springblade.common.constant.stocklist.StockStatusConstant;
@@ -1545,11 +1546,11 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 			}
 		}else {
 			log.warn("预约信息不存在！");
-			return Resp.scanFail("预约信息不存在", "预约信息不存在！");
+			return Resp.scanFail(PdaAudioLingoStatus.yuyuebuzai.getName(), PdaAudioLingoStatus.yuyuebuzai.getName());
 		}
 		if(list.size() < 1){
 			log.warn("包件信息不存在！");
-			return Resp.scanFail("包件信息不存在", "包件信息不存在！");
+			return Resp.scanFail(PdaAudioLingoStatus.baojianbucunzai.getName(), PdaAudioLingoStatus.baojianbucunzai.getName());
 		}
 		//查询托盘上面的包件
 
@@ -1634,10 +1635,12 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 			});
 			//TODO 其他操作
 			//添加扫描记录
+
 			if(!list1.isEmpty()){
 				distributionStockService.saveBatch(list1);
 			}
-			return R.success("备货成功");
+			int i = list1.isEmpty() ? 0 : list1.size();
+			return Resp.scanSuccess("整托拣货"+i+"件","整托拣货"+i+"件");
 		}
 
 	}

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

@@ -47,6 +47,7 @@ import org.springblade.common.constant.billLading.BillLadingStatusConstant;
 import org.springblade.common.constant.order.OrderReservationStatusConstant;
 import org.springblade.common.constant.order.OrderStatusConstant;
 import org.springblade.common.constant.orderpackage.OrderPackageStatusConstant;
+import org.springblade.common.constant.pda.PdaAudioLingoStatus;
 import org.springblade.common.constant.stockup.StockAssignStatusConstant;
 import org.springblade.common.constant.stockup.StockupStatusConstant;
 import org.springblade.common.constant.stockup.StockupTypeConstant;
@@ -1075,7 +1076,30 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 		} else {
 			DistrilbutionBillLadingEntity billLadingEntity1 = baseMapper.selectById((Serializable) billLadingId);
 			if(ObjectUtils.isNotNull(billLadingEntity1) && billLadingEntity1.getConditions().equals("20")){
-				return  Resp.scanFail("任务已完成！", "任务已完成！");
+				return  Resp.scanFail("提货任务已完成！", "提货任务已完成！");
+			}
+			BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
+			if(ObjectUtils.isNull(myCurrentWarehouse)){
+				return Resp.scanFail("请选择仓库！","请选择仓库！");
+			}
+			//查询订单是否已签收
+			List<DistributionParcelListEntity> list4 = distributionParcelListService.list(Wrappers.<DistributionParcelListEntity>query().lambda()
+				.eq(DistributionParcelListEntity::getOrderPackageCode, coding)
+				.eq(DistributionParcelListEntity::getWarehouseId, myCurrentWarehouse.getId())
+			);
+			if(list4.isEmpty()){
+				return Resp.scanFail(PdaAudioLingoStatus.baojianbucunzai.getName(), PdaAudioLingoStatus.baojianbucunzai.getName());
+			}
+
+			DistrilbutionBillStockEntity one2 = distrilbutionBillStockService.getOne(Wrappers.<DistrilbutionBillStockEntity>query().lambda()
+				.eq(DistrilbutionBillStockEntity::getBillLadingId, billLadingId)
+				.eq(DistrilbutionBillStockEntity::getStockArticleId, list4.get(0).getStockArticleId())
+			);
+			if(ObjectUtils.isNull(one2)){
+				return Resp.scanFail("不在本次自提计划！","不在本次自提计划！");
+			}
+			if(one2.getConditions().equals("2")){
+				return Resp.scanFail("当前提货任务，"+list4.get(0).getOrderCode()+"已齐套！","当前提货任务，"+list4.get(0).getOrderCode()+"已齐套！");
 			}
 			//查询是否签收
 			List<DistributionBillLadingScanEntity> list3 = distributionBillLadingScanService.list(Wrappers.<DistributionBillLadingScanEntity>query().lambda()
@@ -1084,7 +1108,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 				.eq(DistributionBillLadingScanEntity::getPacketBarCode, coding)
 			);
 			if (!list3.isEmpty()) {
-				return  Resp.scanFail("已签收！", "已签收！");
+				return  Resp.scanFail("该包件已签收！", "该包件已签收！");
 			}
 
 			//添加扫描记录