备货接口修复

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

@@ -862,13 +862,18 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 						if (ObjectUtils.isNotNull(i.getStockId())) {
 							wu.setScanNum(wu.getScanNum() + i2);
 						}
-						//托盘信息
-						if (ObjectUtils.isNotNull(i.getPallet()) && !wu.getPallet().contains(i.getPallet())) {
-							wu.setPallet(wu.getPallet() + "," + i.getPallet());
+
+						if (Func.isNotEmpty(i.getPallet())){
+							//托盘信息
+							if (ObjectUtils.isNotNull(i.getPallet()) && !wu.getPallet().contains(i.getPallet())) {
+								wu.setPallet(wu.getPallet() + "," + i.getPallet());
+							}
 						}
-						//托盘信息
-						if (ObjectUtils.isNotNull(i.getTrayId()) && !wu.getTrayId().contains(i.getTrayId())) {
-							wu.setTrayId(wu.getTrayId() + "," + i.getTrayId());
+						if (Func.isNotEmpty(i.getTrayId())){
+							//托盘信息
+							if (ObjectUtils.isNotNull(i.getTrayId()) && !wu.getTrayId().contains(i.getTrayId())) {
+								wu.setTrayId(wu.getTrayId() + "," + i.getTrayId());
+							}
 						}
 						//订单自编号信息
 						if (ObjectUtils.isNotNull(i.getOrderCode()) && !wu.getOrderCode().contains(i.getOrderCode())) {