1.干线bug修复

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/OpenLabelDTO.java

@@ -34,6 +34,8 @@ public class OpenLabelDTO implements Serializable {
 
 	private BigDecimal volume;
 
+	private String materialName;
+
 	private String dealerCode;
 	private String dealerName;
 

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataFactoryCategoryMapper.xml

@@ -39,9 +39,6 @@
         <if test="param.type != null and param.type != ''">
             and type = #{param.type}
         </if>
-        <if test="param.category != null and param.category != ''">
-            and category = #{param.category}
-        </if>
         <if test="param.firsts == null or param.firsts == ''">
             and (firsts is null or firsts = '')
         </if>
@@ -60,6 +57,12 @@
         <if test="param.thirds != null and param.thirds != ''">
             and thirds = #{param.thirds}
         </if>
+        <if test="param.materielName == null or param.materielName == ''">
+            and (materiel_name is null or materiel_name = '')
+        </if>
+        <if test="param.materielName != null and param.materielName != ''">
+            and materiel_name = #{param.materielName}
+        </if>
     </select>
 
 </mapper>

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java

@@ -230,15 +230,17 @@ public class InComingServiceImpl implements IInComingService {
 
 			if(incomingType == 1 || incomingType == 2){
 				for (TrunklineAdvanceDetailEntity trunklineAdvanceDetailEntity : advanceDetailEntityList) {
-					Long warehouseId1 = trunklineAdvanceDetailEntity.getWarehouseId();
-					if(!warehouseId1.equals(warehouseId)){
-						log.warn("############incomingPackage: 包件数据不在当前仓 packageCodes={} warehouseId={}", packageCodes, warehouseId);
-						return Resp.scanFail(405, "包件数据不在当前仓", "包件数据不在当前仓");
+					String packageStatus = trunklineAdvanceDetailEntity.getPackageStatus();
+					if("0".equals(packageStatus)){
+						Long warehouseId1 = trunklineAdvanceDetailEntity.getWarehouseId();
+						if(!warehouseId1.equals(warehouseId)){
+							log.warn("############incomingPackage: 包件数据不在当前仓 packageCodes={} warehouseId={}", packageCodes, warehouseId);
+							return Resp.scanFail(405, "包件数据不在当前仓", "包件数据不在当前仓");
+						}
 					}
 				}
 			}
 
-
 			if(StringUtil.isNotBlank(customerTrain)){
 				for (TrunklineAdvanceDetailEntity advanceDetailEntity : advanceDetailEntityList) {
 					String trainNumber = advanceDetailEntity.getTrainNumber();
@@ -344,9 +346,9 @@ public class InComingServiceImpl implements IInComingService {
 									map.put("warehouseId", warehouseId);
 									map.put("orderPackageCode", packageCode);
 									R r = warehouseTrayTypeClient.orderScanOrderPackageCodeReturnR(map);
-									Object data = r.getData();
-									if(!Objects.isNull(data)){
-										audio.set((String) data);
+									int code = r.getCode();
+									if(code != 200){
+										audio.set(r.getMsg());
 									}
 								}
 							});
@@ -442,9 +444,9 @@ public class InComingServiceImpl implements IInComingService {
 									map.put("warehouseId", warehouseId);
 									map.put("orderPackageCode", packageCode);
 									R r = warehouseTrayTypeClient.orderScanOrderPackageCodeReturnR(map);
-									Object data = r.getData();
-									if(!Objects.isNull(data)){
-										audio.set((String) data);
+									int code = r.getCode();
+									if(code != 200){
+										audio.set(r.getMsg());
 									}
 								}
 							});
@@ -495,7 +497,7 @@ public class InComingServiceImpl implements IInComingService {
 
 		String a = audio.get();
 		if(StringUtil.isNotBlank(a)){
-			return Resp.scanSuccess("入库成功",a);
+			return Resp.scanFail(405,a,a);
 		}
 
 		return R.success("入库成功");

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java

@@ -797,15 +797,16 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		}
 
 		//异步存入日志
+		Date date = new Date();
 		String nickName = AuthUtil.getNickName();
 		Long userId = AuthUtil.getUserId();
-		String createOperationRemark = "创建运单" + waybillNo + ",时间：" + CommonUtil.dateToStringGeneral(new Date());
+		String createOperationRemark = "创建运单" + waybillNo + ",时间：" + CommonUtil.dateToStringGeneral(date);
 		openOrderAsyncService.saveLog(waybillId, waybillNo, "10", "创建运单", createOperationRemark, nickName, userId, warehouseId, warehouseName);
 
 		Integer totalCount = waybillEntity.getTotalCount();
 		Integer stockCount = waybillEntity.getStockCount();
 		if (totalCount.equals(stockCount)) {
-			createOperationRemark = "运单入库：" + stockCount + "/" + totalCount + ",入库类型：【零担开单及入库】,入库时间：" + CommonUtil.dateToStringGeneral(waybillEntity.getCreateTime());
+			createOperationRemark = "运单入库：" + stockCount + "/" + totalCount + ",入库类型：【零担开单及入库】,入库时间：" + CommonUtil.dateToStringGeneral(date);
 			openOrderAsyncService.saveLog(waybillId, waybillNo, "20", "已入库", createOperationRemark, nickName, userId, warehouseId, warehouseName);
 		}
 
@@ -1070,7 +1071,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		advanceEntity.setCustomerName(openLabelDTO.getCustomerName());
 		advanceEntity.setCustomerPhone(openLabelDTO.getCustomerPhone());
 		advanceEntity.setCustomerAddress(openLabelDTO.getCustomerAddress());
-		advanceEntity.setSystemType("线上");
+		advanceEntity.setSystemType("线下");
 		advanceEntity.setServiceNum(openLabelDTO.getServiceNum());
 		advanceEntity.setMatingType("1");
 		advanceEntity.setSenderName(openLabelDTO.getSenderName());
@@ -1089,7 +1090,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		advanceDetailModel.setAdvanceId(advanceId);
 		advanceDetailModel.setOrderCode(openLabelDTO.getOrderCode());
 		advanceDetailModel.setBrand(openLabelDTO.getBrand());
-		advanceDetailModel.setSystemType("线上");
+		advanceDetailModel.setSystemType("线下");
 //		advanceDetailModel.setOrderPackageCode(basicdataCodeClient.getCodeByType(CodeNumConstant.PACKAGE, warehouseCode, orderCode));
 
 		advanceDetailModel.setFirstPackName(firsts);
@@ -1106,6 +1107,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 			advanceDetailModel.setThirdPackName(thirds);
 		}
 		advanceDetailModel.setSiteName(openLabelDTO.getSiteName());
+		advanceDetailModel.setMaterialName(openLabelDTO.getMaterialName());
 		advanceDetailModel.setQuantity(1);
 		advanceDetailModel.setServiceNum(openLabelDTO.getServiceNum());
 		advanceDetailModel.setPackageStatus("0");

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingServiceImpl.java

@@ -160,7 +160,7 @@ public class TrunklineBillladingServiceImpl extends BaseServiceImpl<TrunklineBil
 		TrunklineBillladingLogEntity logEntity = new TrunklineBillladingLogEntity();
 		logEntity.setWarehouseId(warehouseId);
 		logEntity.setWarehouseName(warehouseName);
-		logEntity.setCreateUserName(AuthUtil.getUserName());
+		logEntity.setCreateUserName(AuthUtil.getNickName());
 		logEntity.setContent("创建提货单 billladingCode="+billladingCode);
 		logEntity.setBillladingId(billladingId);
 		logEntity.setAfterOpreation(JSON.toJSONString(trunklineBillladingEntity));

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java

@@ -3364,8 +3364,8 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 		orderDetailVO.setScanNum(scanNum);
 		List<ParcelListVO> list = warehouseTrayGoodsService.findAllPackageDetailByOrderCode(orderCode,warehouseId);
 		for (ParcelListVO parcelListVO:list){
-			String trayName = parcelListVO.getTrayName();
-			if(trayCode.equals(trayName)){
+			String trayCode1 = parcelListVO.getTrayCode();
+			if(trayCode.equals(trayCode1)){
 				parcelListVO.setDeletedStatus(1);
 			}else{
 				parcelListVO.setDeletedStatus(0);