1.修复耗材字典等的bug

api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvPreInProductsController.java

@@ -6,7 +6,6 @@ import com.github.pagehelper.PageInfo;
 import com.glxp.sale.admin.annotation.AuthRuleAnnotation;
 import com.glxp.sale.admin.constant.ConstantStatus;
 import com.glxp.sale.admin.constant.ConstantType;
-import com.glxp.sale.admin.entity.info.CompanyEntity;
 import com.glxp.sale.admin.entity.inventory.InvProductDetailEntity;
 import com.glxp.sale.admin.entity.inventory.InvProductEntity;
 import com.glxp.sale.admin.req.inout.DeleteRequest;
@@ -50,14 +49,14 @@ public class InvPreInProductsController {
     @GetMapping("spms/prein/inv/products/filter")
     public BaseResponse filterInvProduct(FilterInvProductRequest filterInvProductRequest) {
         boolean showSup = false;
-        if (Constant.SYSTEM_CUSTOMER_ID.equals(filterInvProductRequest.getCustomerId())) {
+       /* if (Constant.SYSTEM_CUSTOMER_ID.equals(filterInvProductRequest.getCustomerId())) {
             filterInvProductRequest.setCustomerId(null);
             showSup = true;
         } else {
             CompanyEntity companyEntity = companyService.findCompany((filterInvProductRequest.getCustomerId()));
             filterInvProductRequest.setSupId(companyEntity.getUnitIdFk());
             filterInvProductRequest.setCustomerId(null);
-        }
+        }*/
         List<InvProductResponse> invProductResponses = invProductService.filterJoinInvProduct(filterInvProductRequest);
         PageInfo<InvProductResponse> pageInfo;
         pageInfo = new PageInfo<>(invProductResponses);

api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml

@@ -54,6 +54,7 @@
         basic_products.basicPrductRemak6,
         basic_products.basicPrductRemak7,
         basic_products.basicPrductRemak8,
+        basic_udirel.id relId,
         basic_udirel.thirdId,
         basic_udirel.thirdName,
         basic_udirel.isUseDy,

api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml

@@ -202,7 +202,7 @@
         <if test="groupType != '' and groupType != null">
             GROUP BY #{groupType}
         </if>
-        group by inv_prein_product.id
+        group by inv_prein_product.orderIdFk
         order by inv_prein_product.updateTime desc
     </select>
     <insert id="insertInvProduct" keyProperty="id"