移动返回数据格式封装，针对物料信息赋值方法更新

src/main/java/com/uas/ps/inquiry/service/impl/InquiryForSaleServiceImpl.java

@@ -268,7 +268,7 @@ public class InquiryForSaleServiceImpl implements InquiryForSaleService {
                 product.setBrand(inquiryItem.getInbrand());
                 product.setSpec(inquiryItem.getSpec());
                 product.setCode(inquiryItem.getProdCode());
-                if (inquiryItem.getProdCode() == null) {
+                if (product.getCode() == null) {
                     product.setCode(inquiryItem.getCmpCode());
                 }
                 inquiryItem.setProduct(product);

src/main/java/com/uas/ps/inquiry/service/impl/InquiryServiceImpl.java

@@ -88,7 +88,6 @@ public class InquiryServiceImpl implements InquiryService {
             if (StringUtils.hasText(filter.getKeyword())) {
                 SimpleExpression cmpCode = new SimpleExpression("cmpCode", filter.getKeyword(), CriterionExpression.Operator.LIKE);
                 SimpleExpression brand = new SimpleExpression("inbrand", filter.getKeyword(), CriterionExpression.Operator.LIKE);
-                //SimpleExpression code = new SimpleExpression("product.cmpCode", filter.getKeyword(), CriterionExpression.Operator.LIKE);
                 SimpleExpression[] simpleExpressions = new SimpleExpression[]{cmpCode, brand};
                 LogicalExpression logicalExpression = PredicateUtils.or(simpleExpressions);
                 info.expression(logicalExpression);

src/main/java/com/uas/ps/inquiry/service/impl/PublicInquiryServiceImpl.java

@@ -930,7 +930,7 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
                     product.setBrand(itemInfo.getInbrand());
                     product.setSpec(itemInfo.getSpec());
                     product.setCode(itemInfo.getProdCode());
-                    if (itemInfo.getProdCode() == null) {
+                    if (null == product.getCode()) {
                         product.setCode(itemInfo.getCmpCode());
                     }
                     itemInfo.setProduct(product);