处理更新物料报错的问题。

src/main/java/com/uas/platform/b2c/logistics/service/impl/InvoiceFOrderServiceImpl.java

@@ -371,6 +371,7 @@ public class InvoiceFOrderServiceImpl implements InvoiceFOrderService {
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		order.setDeliverTime(sdf.format(new Date()));
 		order.setJsonSdAddress(addr);
+		order.addInInds(inF.getId());
 		Set<OrderDetail> orderDetails = order.getOrderDetails();
 		if (NumberUtil.compare(order.getQty(), order.getShipQty()) < 1) {
 			for (OrderDetail orderDetail : orderDetails) {

src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/ProductServiceImpl.java

@@ -1956,12 +1956,16 @@ public class ProductServiceImpl implements ProductService {
                                 code = (String) resultMap.getData();
                             }
                         }
-                        ResultMap kindResultMap = StringUtilB2C.validateKind(kind);
-                        if (kindResultMap.getCode() != CodeType.OK.code()) {
-                            return kindResultMap;
-                        } else {
-                            productPrivate.setKind((String) kindResultMap.getData());
+                        if (!StringUtilB2C.equals(productPrivate.getKind(), product.getKind())) {
+                            kind = product.getKind();
+                            ResultMap kindResultMap = StringUtilB2C.validateKind(kind);
+                            if (kindResultMap.getCode() != CodeType.OK.code()) {
+                                return kindResultMap;
+                            } else {
+                                productPrivate.setKind((String) kindResultMap.getData());
+                            }
                         }
+
                         //如果修改了品牌、或者型号，需要匹配看，是否为标准
                         if (!StringUtils.isEmpty(brand) || !StringUtils.isEmpty(code)) {
                             if (StringUtils.isEmpty(code)) {

src/main/java/com/uas/platform/b2c/trade/order/model/Order.java

@@ -449,6 +449,12 @@ public class Order extends Document implements Serializable {
 	@Column(name = "or_uaspurcid")
 	private Long uasPurcid;
 
+	/**
+	 * 关联出货单id
+	 */
+	@Column(name = "or_ininds")
+	private String inInds;
+
 	/**
 	 * 订单明细
 	 */
@@ -2578,6 +2584,23 @@ public class Order extends Document implements Serializable {
 		return this;
 	}
 
+	public String getInInds() {
+		return inInds;
+	}
+
+	public Order setInInds(String inInds) {
+		this.inInds = inInds;
+		return this;
+	}
+
+	public Order addInInds(Long inInds) {
+		if (!StringUtils.isEmpty(this.inInds)) {
+			this.inInds += ",";
+		}
+		this.inInds += inInds;
+		return this;
+	}
+
 	@Override
 	public String toString() {
 		return "Order{" +