预验收库存删除，耗材字典新增供应商查询

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

@@ -58,9 +58,9 @@ public class InvPreInProductsController {
 //            filterInvProductRequest.setCustomerId(null);
 //        }
 
-        if(StrUtil.isNotBlank(filterInvProductRequest.getOrderIdFk())){
+        if (StrUtil.isNotBlank(filterInvProductRequest.getOrderIdFk())) {
             StockOrderEntity stockOrderEntity = stockOrderDao.selectByBillNo(filterInvProductRequest.getOrderIdFk());
-            if(stockOrderEntity !=null && StrUtil.isNotBlank(stockOrderEntity.getOrderIdFk())){
+            if (stockOrderEntity != null && StrUtil.isNotBlank(stockOrderEntity.getOrderIdFk())) {
                 filterInvProductRequest.setOrderIdFk(stockOrderEntity.getOrderIdFk());
             }
         }
@@ -153,15 +153,7 @@ public class InvPreInProductsController {
         InvProductEntity invProductEntity = invProductService.selectById(id);
         if (invProductEntity != null) {
             invProductService.deleteById(id);
-            FilterInvProductDetailRequest detailRequest = new FilterInvProductDetailRequest();
+            invProductDetailService.deleteByOrderIdFk(invProductEntity.getOrderIdFk());
-            detailRequest.setSupId(invProductEntity.getSupId());
-            if (StrUtil.isEmpty(invProductEntity.getBatchNo())) {
-                detailRequest.setBatchNo("empty");
-            } else
-                detailRequest.setBatchNo(invProductEntity.getBatchNo());
-            detailRequest.setProductIdFk(invProductEntity.getRelIdFk());
-            detailRequest.setInvStorageCode(invProductEntity.getInvStorageCode());
-            invProductDetailService.deleteByProductId(detailRequest);
             return ResultVOUtils.success("删除成功");
         } else {
             return ResultVOUtils.error(500, "删除失败！");

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

@@ -362,8 +362,11 @@
                basic_products.basicPrductRemak8,
                basic_products.hchzsb
         FROM basic_products
-                 right JOIN basic_udirel
+            right JOIN basic_udirel
-                            ON basic_products.uuid = basic_udirel.uuid
+                       ON basic_products.uuid = basic_udirel.uuid
+        <if test="supId != null and supId != ''">
+            left join company_product_relevance on basic_udirel.id = company_product_relevance.udiRlIdFk
+        </if>
         <where>
             <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
                 AND ylqxzcrbarmc LIKE concat('%', #{ylqxzcrbarmc}, '%')
@@ -454,6 +457,9 @@
             <if test="id != '' and id != null">
                 AND basic_udirel.id = #{id}
             </if>
+            <if test="supId != null and supId != ''">
+                AND company_product_relevance.customerId = #{supId}
+            </if>
         </where>
         ORDER BY modifyTime DESC
     </select>
@@ -773,6 +779,12 @@
             <if test="price != null">
                 price=#{price},
             </if>
+            <if test="dispatch != null">
+                dispatch=#{dispatch},
+            </if>
+            <if test="groupBuy != null">
+                groupBuy=#{groupBuy},
+            </if>
         </trim>
         WHERE id = #{id}
     </update>