fix: 集团物料查询报错修复

order-management-common/src/main/java/com/dxhy/order/model/OrderItemInfo.java

@@ -185,4 +185,9 @@ public class OrderItemInfo implements Serializable {
      */
     private String tswl;
 
+    /**
+     * 价税合计
+     */
+    private String jshj;
+
 }

order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/PageDataDealUtil.java

@@ -83,6 +83,12 @@ public class PageDataDealUtil {
                 orderItemInfo.setSl(orderItemInfo.getSl().contains("%") ? orderItemInfo.getSl() : CommonUtils.formatPercentSl(orderItemInfo.getSl()));
             }
 
+            if(ConfigureConstant.STRING_0.equals(orderItemInfo.getHsbz())){
+                orderItemInfo.setJshj(new BigDecimal(orderItemInfo.getXmje()).add(new BigDecimal(orderItemInfo.getSe())).toString());
+            }else {
+                orderItemInfo.setJshj(orderItemInfo.getXmje());
+            }
+
         }
 
     }

order-management-consumer/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml

@@ -110,10 +110,10 @@
                 AND cc.wlflmc LIKE CONCAT('%',#{wlflmc},'%')
             </if>
             <if test="zxbm != null and zxbm != ''">
-                AND cc.zxbm LIKE CONCAT('%',#{zxbm},'%')
+                AND cc.encoding LIKE CONCAT('%',#{zxbm},'%')
             </if>
             <if test="xmmc != null and xmmc != ''">
-                AND cc.xmmc LIKE CONCAT('%',#{xmmc},'%')
+                AND cc.merchandise_name LIKE CONCAT('%',#{xmmc},'%')
             </if>
             AND cc.xhf_nsrsbh = '-1'
         </where>