Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java

@@ -29,6 +29,7 @@ import com.glxp.api.res.basic.UdiRlSupResponse;
 import com.glxp.api.service.auth.AuthAdminService;
 import com.glxp.api.service.basic.*;
 import com.glxp.api.service.system.CompanyService;
+import com.glxp.api.util.BeanCopyUtils;
 import com.glxp.api.util.SupplementVailUtil;
 import com.glxp.api.util.udi.FilterUdiUtils;
 import org.springframework.validation.BindingResult;
@@ -117,6 +118,55 @@ public class UdiRlSupController extends BaseController {
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
+    @AuthRuleAnnotation("")
+    @GetMapping("/sale/info/company/product/plan/relevance/filter")
+    public BaseResponse filterCompanyProductPlanRelevance(CompanyProductRelevanceRequest companyProductRelevanceRequest,
+                                                      BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        if (StrUtil.isNotEmpty(companyProductRelevanceRequest.getCustomerId())) {
+            String customerId = getCustomerId();
+            if (customerId.equals("110")) {
+                companyProductRelevanceRequest.setCustomerId(null);
+            }
+        }
+
+        companyProductRelevanceRequest.setIsDisable(false);
+        if (StrUtil.isNotEmpty(companyProductRelevanceRequest.getUdiCode())) {
+            UdiEntity udiEntity = FilterUdiUtils.getUdi(companyProductRelevanceRequest.getUdiCode());
+            if (udiEntity != null) {
+                companyProductRelevanceRequest.setNameCode(udiEntity.getUdi());
+                companyProductRelevanceRequest.setUnionCode(udiEntity.getUdi());
+            }
+        }
+        //如果输入DI标识，精确找到不同层级对应的产品信息
+        if (StrUtil.isNotEmpty(companyProductRelevanceRequest.getUnionCode())) {
+            FilterUdiRelRequest filterUdiInfoRequest = new FilterUdiRelRequest();
+            filterUdiInfoRequest.setNameCode(companyProductRelevanceRequest.getUnionCode());
+            List<UdiRelevanceResponse> temps = udiRelevanceService.filterUdiGp(filterUdiInfoRequest);
+            if (temps != null && temps.size() > 0) {
+                companyProductRelevanceRequest.setOriginUuid(temps.get(0).getOriginUuid());
+                companyProductRelevanceRequest.setNameCode(filterUdiInfoRequest.getNameCode());
+                companyProductRelevanceRequest.setUnionCode(null);
+            }
+        } else {
+            //只查找主标识产品信息
+            companyProductRelevanceRequest.setDiType(1);
+        }
+        List<UdiRelevanceResponse> basicInstrumentMaintainRelevanceResponses = null;
+        FilterUdiRelRequest filterUdiRelRequest=new FilterUdiRelRequest();
+        BeanCopyUtils.copy(companyProductRelevanceRequest,filterUdiRelRequest);
+        basicInstrumentMaintainRelevanceResponses = udiRelevanceService.filterUdiJoinSup(filterUdiRelRequest);
+        PageInfo<UdiRelevanceResponse> pageInfo;
+        pageInfo = new PageInfo<>(basicInstrumentMaintainRelevanceResponses);
+        PageSimpleResponse<UdiRelevanceResponse> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(basicInstrumentMaintainRelevanceResponses);
+
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
     @AuthRuleAnnotation("")
     @GetMapping("/sale/info/company/product/corp/filter")
     public BaseResponse filterRlCorp(FilterCompanyProductRelevanceRequest filterCompanyProductRelevanceRequest,

src/main/java/com/glxp/api/controller/inout/IoOrderMutiController.java

@@ -296,8 +296,15 @@ public class IoOrderMutiController {
             return ResultVOUtils.error(999,"请先设置多次出库单据类型!");
         }
         ioOrderMutiRequest.setStatus(0);
+
         List<IoOrderMutiResponse> ioOrderMutiEntityList = ioOrderMutiService.filterList(ioOrderMutiRequest);
-        return ResultVOUtils.success(ioOrderMutiEntityList);
+        if(ioOrderMutiEntityList.size()<0){
+            return ResultVOUtils.error(999,"该产品不存在此标识！");
+        }
+        if(ioOrderMutiEntityList.get(0).getReCount()<=0){
+            return ResultVOUtils.error(999,"该产品可使用数量不足！");
+        }
+        return ResultVOUtils.success(ioOrderMutiEntityList.get(0));
     }
 
     @PostMapping("/udiwms/inout/order/muti/selectMutiDetailList")

src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java

@@ -170,10 +170,10 @@ public class IoPurChangeService {
                 purApplyEntity1.setGeneratePlan(true);
                 purApplyService.update(purApplyEntity1);
             }
-            if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetBusAction()) && basicBusTypeChangeEntity.isEnable() == true) {
+//            if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetBusAction()) && basicBusTypeChangeEntity.isEnable() == true) {
-                purApplyGen(purApplyEntity);
+//                purApplyGen(purApplyEntity);
-                System.out.println("6666666666666666666999999999999999");
+//                System.out.println("6666666666666666666999999999999999");
-            }
+//            }
         }
     }
 
@@ -185,10 +185,21 @@ public class IoPurChangeService {
         String billNos = null;
         //---------------------------------判断计划为已审核就生成计划单-------------------------------------------//\
         if (purPlanEntity.getStatus() == 3) {
-            //查询计划详情
+            //查询有供应商计划详情
             List<PurPlanDetailEntity> purPlanDetailEntityList = purPlanDetailService.findByOrderId(purPlanEntity.getId() + "");
+            List<PurPlanDetailEntity> purPlanDetailEntityList1 = new ArrayList<>(); //有供应商
+            List<PurPlanDetailEntity> purPlanDetailEntityList2 = new ArrayList<>(); //无供应商
+            for (PurPlanDetailEntity purPlanDetailEntity : purPlanDetailEntityList) {
+                  if(StrUtil.isNotBlank(purPlanDetailEntity.getSupId())){
+                      purPlanDetailEntityList1.add(purPlanDetailEntity);
+                  }else{
+                      purPlanDetailEntityList2.add(purPlanDetailEntity);
+                  }
+            }
+
             //根据供应商分组
-            Map<String, List<PurPlanDetailEntity>> purPlanDetailMap = purPlanDetailEntityList.stream().collect(Collectors.groupingBy(PurPlanDetailEntity::getSupId));
+            Map<String, List<PurPlanDetailEntity>> purPlanDetailMap = purPlanDetailEntityList1.stream().collect(Collectors.groupingBy(PurPlanDetailEntity::getSupId));
+            purPlanDetailMap.put("not",purPlanDetailEntityList2);
             basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction("CGJH");
             if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetBusAction()) && basicBusTypeChangeEntity.isEnable() == true) {
                 for (String key : purPlanDetailMap.keySet()) {
@@ -196,7 +207,9 @@ public class IoPurChangeService {
                     List<PurPlanDetailEntity> purPlanDetailEntitys = purPlanDetailMap.get(key);
                     purOrderEntity.setBillNo(gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.CG_ORDER, "yyyyMMdd")));
                     purOrderEntity.setBillDate(purPlanEntity.getBillDate());
-                    purOrderEntity.setSupId(key);
+                    if(!key.equals("not")){
+                        purOrderEntity.setSupId(key);
+                    }
                     purOrderEntity.setStatus(basicBusTypeChangeEntity.getBusAuditStatus());
                     purOrderEntity.setRemark(purPlanEntity.getRemark());
                     purOrderEntity.setEmergency(purPlanEntity.getEmergency());

src/main/java/com/glxp/api/controller/purchase/PurOrderController.java

@@ -1,16 +1,18 @@
 package com.glxp.api.controller.purchase;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageInfo;
 import com.glxp.api.annotation.AuthRuleAnnotation;
 import com.glxp.api.annotation.RepeatSubmit;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.constant.Constant;
-import com.glxp.api.entity.purchase.PurApplyEntity;
+import com.glxp.api.entity.basic.BasicCorpEntity;
-import com.glxp.api.entity.purchase.PurOrderDetailEntity;
+import com.glxp.api.entity.inv.InvProductDetailEntity;
-import com.glxp.api.entity.purchase.PurOrderEntity;
+import com.glxp.api.entity.purchase.*;
-import com.glxp.api.entity.purchase.PurPlanDetailEntity;
+import com.glxp.api.req.inv.FilterInvProductDetailRequest;
 import com.glxp.api.req.purchase.PostPurOrderRequest;
 import com.glxp.api.req.purchase.PurOrderDetailRequest;
 import com.glxp.api.req.purchase.PurOrderRequest;
@@ -33,10 +35,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.validation.constraints.NotEmpty;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
 import java.util.stream.Collectors;
 
 
@@ -81,7 +80,7 @@ public class PurOrderController {
 
         Long userId = customerService.getUserId();
         PurOrderEntity purOrderEntity = postPurOrderRequest.getPurOrderEntity();
-
+        Long id=purOrderEntity.getId();
         purOrderEntity.setCreateUser(userId + "");
         purOrderEntity.setCreateTime(new Date());
         purOrderEntity.setUpdateTime(new Date());
@@ -96,7 +95,29 @@ public class PurOrderController {
         if (purOrderEntity.getId() == null) {
             purOrderService.insert(purOrderEntity);
         } else {
-            purOrderService.update(purOrderEntity);
+            List<PurOrderDetailEntity> purOrderDetailEntityList = purOrderDetailService.findByOrderId(purOrderEntity.getId() + "");
+            //判断是不是存在同一个供应商产品
+            Map<String, List<PurOrderDetailEntity>> purOrderDetailMap = purOrderDetailEntityList.stream().collect(Collectors.groupingBy(PurOrderDetailEntity::getSupId));
+            if (purOrderDetailMap.size() > 1) {
+                for (String key : purOrderDetailMap.keySet()) {
+                    List<PurOrderDetailEntity> purOrderDetailEntities = purOrderDetailMap.get(key);
+                    PurOrderEntity purOrderEntity1 = new PurOrderEntity();
+                    purOrderEntity1 = purOrderEntity;
+                    purOrderEntity1.setId(null);
+                    purOrderEntity1.setSupId(key);
+                    purOrderEntity1.setBillNo(gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.CG_ORDER, "yyyyMMdd")));
+                    purOrderService.insert(purOrderEntity1);
+                    for (PurOrderDetailEntity purOrderDetailEntity : purOrderDetailEntities) {
+                        purOrderDetailEntity.setId(null);
+                        purOrderDetailEntity.setOrderIdFk(purOrderEntity1.getId() + "");
+                    }
+                    purOrderDetailService.insertPurOrderDetailEntity(purOrderDetailMap.get(key));
+                }
+                purOrderService.deleteById(id);
+                purOrderDetailService.deleteByOrderId(id + "");
+            } else {
+                purOrderService.update(purOrderEntity);
+            }
         }
 
         return ResultVOUtils.success("提交成功！");
@@ -367,6 +388,11 @@ public class PurOrderController {
     @RepeatSubmit()
     @PostMapping("/purchase/order/updateDetail")
     public BaseResponse detailEdit(@RequestBody PurOrderDetailEntity purOrderDetailEntity) {
+
+        if (StrUtil.isBlank(purOrderDetailEntity.getSupId())) {
+            purOrderDetailEntity.setSupId(purOrderDetailEntity.getSupName());
+        }
+
         purOrderDetailService.update(purOrderDetailEntity);
         return ResultVOUtils.success("修改成功");
     }
@@ -384,4 +410,17 @@ public class PurOrderController {
         return ResultVOUtils.success("删除成功");
     }
 
+    /**
+     * 查询产品供应商
+     *
+     * @param purOrderDetailEntity
+     * @return
+     */
+    @PostMapping("/purchase/order/filterSupList")
+    public BaseResponse filterSupList(@RequestBody PurOrderDetailEntity purOrderDetailEntity) {
+
+        List<BasicCorpEntity> selectsupList = purOrderDetailService.selectsupList(purOrderDetailEntity);
+        return ResultVOUtils.success(selectsupList);
+    }
+
 }

src/main/java/com/glxp/api/controller/thrsys/ThrDeptController.java

@@ -100,16 +100,7 @@ public class ThrDeptController {
         }
         String id = Long.toString(thrDeptEntity.getId());
         ThrDeptEntity thrDeptEntity1 = thrDeptService.selectById(id);
-        //查询该部门下的仓库
+
-        filterThrSubInvWarehouseRequest.setParentId(thrDeptEntity1.getCode());
-        List<ThrInvWarehouseEntity> thrDept = thrInvWarehouseService.filterThrInvWarehouse(filterThrSubInvWarehouseRequest);
-
-        for (ThrInvWarehouseEntity thrInvWarehouseEntity : thrDept) {
-            thrInvWarehouseEntity.setParentId(thrDeptEntity.getCode());
-            thrInvWarehouseEntity.setThirdSysFk(thrDeptEntity.getThirdSysFk());
-            //修改仓库
-            thrInvWarehouseService.updateThrInvWarehouse(thrInvWarehouseEntity);
-        }
         //判断部门是否存在
         filterThrDeptRequest.setCode(thrDeptEntity.getCode());
         filterThrDeptRequest.setName(thrDeptEntity.getName());
@@ -122,6 +113,16 @@ public class ThrDeptController {
             if (!b) {
                 return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
             }
+            //查询该部门下的仓库
+            filterThrSubInvWarehouseRequest.setParentId(thrDeptEntity1.getCode());
+            List<ThrInvWarehouseEntity> thrDept = thrInvWarehouseService.filterThrInvWarehouse(filterThrSubInvWarehouseRequest);
+
+            for (ThrInvWarehouseEntity thrInvWarehouseEntity : thrDept) {
+                thrInvWarehouseEntity.setParentId(thrDeptEntity.getCode());
+                thrInvWarehouseEntity.setThirdSysFk(thrDeptEntity.getThirdSysFk());
+                //修改仓库
+                thrInvWarehouseService.updateThrInvWarehouse(thrInvWarehouseEntity);
+            }
             return ResultVOUtils.success();
         } else {
             return ResultVOUtils.error(ResultEnum.DATA_REPEAT);

src/main/java/com/glxp/api/controller/thrsys/ThrProductsExportLogController.java

@@ -5,6 +5,7 @@ import com.glxp.api.common.enums.ResultEnum;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.constant.BasicProcessStatus;
+import com.glxp.api.entity.thrsys.ThrProductsEntity;
 import com.glxp.api.entity.thrsys.ThrProductsExportLogEntity;
 import com.glxp.api.entity.thrsys.ThrSystemDetailEntity;
 import com.glxp.api.http.ErpBasicClient;
@@ -118,6 +119,11 @@ public class ThrProductsExportLogController {
     @PostMapping("/udiwms/thrProducts/importLog/export")
     public BaseResponse excelDownload(@RequestBody ThrProductsExportRequest thrProductsExportRequest) {
         ThrProductsExportLogEntity thrProductsExportLogEntity = new ThrProductsExportLogEntity();
+        FilterThrProductsRequest filterThrProductsRequest = new FilterThrProductsRequest();
+        filterThrProductsRequest.setThirdSysFk(thrProductsExportRequest.getThirdSys());
+        filterThrProductsRequest.setThirdSys(thrProductsExportRequest.getThirdSys());
+        List<ThrProductsEntity> thrProductsEntities = thrProductsService.filterThrProducts1(filterThrProductsRequest);
+        thrProductsExportRequest.setThrProductsEntities(thrProductsEntities);
         thrProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_PROCESS);
         String genKey = CustomUtil.getId();
         String fileName = "D:\\udiwms\\exportFile\\" + "第三方产品信息" + genKey + ".UpperIn";

src/main/java/com/glxp/api/dao/purchase/PurOrderDetailDao.java

@@ -1,6 +1,7 @@
 package com.glxp.api.dao.purchase;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.api.entity.basic.BasicCorpEntity;
 import com.glxp.api.entity.basic.BasicProductsEntity;
 import com.glxp.api.entity.purchase.PurOrderDetailEntity;
 import com.glxp.api.req.purchase.PurOrderDetailRequest;
@@ -26,4 +27,6 @@ public interface PurOrderDetailDao extends BaseMapper<PurOrderDetailEntity> {
     BasicProductsEntity selectIoOrderDetailBiz(@Param("id") long id);
 
     List<PurOrderDetailResponse> selectDetailList(PurOrderDetailRequest purOrderDetailRequest);
+
+    List<BasicCorpEntity> selectsupList(PurOrderDetailEntity purOrderDetailEntity);
 }

src/main/java/com/glxp/api/entity/purchase/PurOrderDetailEntity.java

@@ -53,6 +53,9 @@ public class PurOrderDetailEntity {
     @TableField(value = "zczbhhzbapzbh")
     private String zczbhhzbapzbh;
 
+    @TableField(exist = false)
+    private String supName;
+
     public static final String COL_ID = "id";
 
     public static final String COL_ORDERIDFK = "orderIdFk";

src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java

@@ -24,6 +24,7 @@ public class CompanyProductRelevanceRequest extends ListPageRequest {
 
     private String thirdCode;
     private String thirdSys;
+    private String mainId;
 
     private String lastUpdateTime;
     private String zczbhhzbapzbh;

src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java

@@ -22,7 +22,7 @@ public class FilterUdiRelRequest extends ListPageRequest {
     private String thirdId2;
     private String thirdId3;
     private String thirdId4;
-
+    private Boolean isDisable;
 
     private String thirdCode;
     private String thirdSys;
@@ -40,9 +40,12 @@ public class FilterUdiRelRequest extends ListPageRequest {
     private Boolean isCheck;
 
     private Integer filterType;         //0:全部，1.对照完成，2.未对照DI，3.未对照产品编码，4.未对照其他产品编码
+    private String customerId;
+
+    private String pinyinInitial;
+    private String code;
 
     private Integer lockStatus;
-    private String customerId;
     private String udplatCode;
     private String mainId;
     private Boolean isAdavence;
@@ -52,8 +55,8 @@ public class FilterUdiRelRequest extends ListPageRequest {
     private String ybbm;
     private String sptm;
     private String unionFilterStr;//产品名称，规格，批文，生产厂家联合查询
+    private String main;
 
-    private Boolean isDisable;
     List<String> relIds;
     private String uniqueNameCode;
     private String supName;
@@ -70,4 +73,6 @@ public class FilterUdiRelRequest extends ListPageRequest {
     private Boolean dispatch;
     private Boolean groupBuy;
 
+    private List<String> uuids;
+
 }

src/main/java/com/glxp/api/req/purchase/PurPlanDetailRequest.java

@@ -76,4 +76,6 @@ public class PurPlanDetailRequest extends ListPageRequest {
      */
     private String manufactory;
 
+    private String checksupId;
+
 }

src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java

@@ -32,6 +32,7 @@ public class UdiRelevanceResponse {
     private String updateUser;
     private String remark;
 
+
     //UdiInfoEntity
     private String originUuid;
     private String nameCode;
@@ -84,6 +85,7 @@ public class UdiRelevanceResponse {
     private String basicPrductRemak7;
     private String basicPrductRemak8;
     private BigDecimal price;
+    private String PRId;
 
     private Boolean isSelect;
 
@@ -110,6 +112,8 @@ public class UdiRelevanceResponse {
     private String classifyName;        //物资分类名称
     private Integer zdcfsycs;
 
+    private String customerId;
+
     public int getBhzxxsbzsl() {
         if (bhzxxsbzsl == null || bhzxxsbzsl == 0) {
             return 1;

src/main/java/com/glxp/api/service/purchase/PurOrderDetailService.java

@@ -1,6 +1,7 @@
 package com.glxp.api.service.purchase;
 
 
+import com.glxp.api.entity.basic.BasicCorpEntity;
 import com.glxp.api.entity.basic.BasicProductsEntity;
 import com.glxp.api.entity.purchase.PurOrderDetailEntity;
 import com.glxp.api.req.purchase.PurOrderDetailRequest;
@@ -32,4 +33,6 @@ public interface PurOrderDetailService {
     BasicProductsEntity selectIoOrderDetailBiz(long id);
 
     List<PurOrderDetailResponse> getDetailList(PurOrderDetailRequest purOrderDetailRequest);
+
+    List<BasicCorpEntity> selectsupList(PurOrderDetailEntity purOrderDetailEntity);
 }

src/main/java/com/glxp/api/service/purchase/impl/PurOrderDetailServiceImpl.java

@@ -2,6 +2,7 @@ package com.glxp.api.service.purchase.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.glxp.api.dao.purchase.PurOrderDetailDao;
+import com.glxp.api.entity.basic.BasicCorpEntity;
 import com.glxp.api.entity.basic.BasicProductsEntity;
 import com.glxp.api.entity.purchase.PurOrderDetailEntity;
 import com.glxp.api.req.purchase.PurOrderDetailRequest;
@@ -101,4 +102,9 @@ public class PurOrderDetailServiceImpl implements PurOrderDetailService {
         }
         return purOrderDetailDao.selectDetailList(purOrderDetailRequest);
     }
+
+    @Override
+    public List<BasicCorpEntity> selectsupList(PurOrderDetailEntity purOrderDetailEntity) {
+        return purOrderDetailDao.selectsupList(purOrderDetailEntity);
+    }
 }

src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml

@@ -126,6 +126,7 @@
     <select id="filterUdiJoinSup" parameterType="com.glxp.api.req.basic.FilterUdiRelRequest"
             resultType="com.glxp.api.res.basic.UdiRelevanceResponse">
         select basic_udirel.*,
+               basic_products.id as PRId,
                basic_products.originUuid,
                basic_products.nameCode,
                basic_products.deviceRecordKey,
@@ -178,6 +179,7 @@
                basic_products.basicPrductRemak7,
                basic_products.basicPrductRemak8,
                company_product_relevance.unitFk,
+               basic_corp.erpId as customerId,
                basic_corp.name companyName
         FROM basic_udirel
                      inner JOIN basic_products
@@ -192,6 +194,12 @@
             <if test="supName != '' and supName != null">
                 AND supName LIKE concat('%', #{supName}, '%')
             </if>
+            <if test="pinyinInitial != null and pinyinInitial != ''">
+                AND basic_products.pinyinInitial like concat('%', #{pinyinInitial}, '%')
+            </if>
+            <if test="ggxh != '' and ggxh != null">
+                AND ggxh LIKE concat('%', #{ggxh}, '%')
+            </if>
             <if test="cpmctymc != '' and cpmctymc != null">
                 AND cpmctymc LIKE concat('%', #{cpmctymc}, '%')
             </if>

src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml

@@ -35,7 +35,7 @@
         pur_apply_detail
         INNER JOIN basic_udirel ON pur_apply_detail.productId = basic_udirel.id
         INNER JOIN basic_products ON basic_udirel.uuid = basic_products.uuid
-        INNER JOIN basic_corp ON pur_apply_detail.supId = basic_corp.erpId
+        left JOIN basic_corp ON pur_apply_detail.supId = basic_corp.erpId
         <where>
             <if test="orderIdFk != '' and orderIdFk != null">
                 AND orderIdFk = #{orderIdFk}
@@ -127,7 +127,7 @@
         pur_apply_detail
         INNER JOIN basic_udirel ON pur_apply_detail.productId = basic_udirel.id
         INNER JOIN basic_products ON basic_udirel.uuid = basic_products.uuid
-        INNER JOIN basic_corp ON pur_apply_detail.supId = basic_corp.erpId
+        left JOIN basic_corp ON pur_apply_detail.supId = basic_corp.erpId
         left join pur_apply on pur_apply.id = pur_apply_detail.orderIdFk
         <where>
             <if test="billNo != null and billNo != ''">

src/main/resources/mybatis/mapper/purchase/PurOrderDetailDao.xml

@@ -181,4 +181,20 @@
             and pur_order.status = 3
         </where>
     </select>
+
+    <select id="selectsupList" resultType="com.glxp.api.entity.basic.BasicCorpEntity">
+        SELECT
+        basic_corp.`name`,
+        basic_corp.erpId
+        FROM
+        basic_udirel
+        INNER JOIN basic_products ON basic_udirel.uuid = basic_products.uuid
+        INNER JOIN company_product_relevance ON company_product_relevance.udiRlIdFk = basic_udirel.id
+        INNER JOIN basic_corp ON basic_corp.erpId = company_product_relevance.customerId
+        <where>
+            <if test="productId != null">
+                AND basic_udirel.id = #{productId}
+            </if>
+        </where>
+    </select>
 </mapper>

src/main/resources/mybatis/mapper/purchase/PurPlanDetailDao.xml

@@ -35,7 +35,7 @@
         pur_plan_detail
         INNER JOIN basic_udirel ON pur_plan_detail.productId = basic_udirel.id
         INNER JOIN basic_products ON basic_udirel.uuid = basic_products.uuid
-        INNER JOIN basic_corp ON pur_plan_detail.supId = basic_corp.erpId
+        left JOIN basic_corp ON pur_plan_detail.supId = basic_corp.erpId
         <where>
             <if test="orderIdFk != '' and orderIdFk != null">
                 AND orderIdFk = #{orderIdFk}
@@ -144,7 +144,7 @@
         pur_plan_detail
         INNER JOIN basic_udirel ON pur_plan_detail.productId = basic_udirel.id
         INNER JOIN basic_products ON basic_udirel.uuid = basic_products.uuid
-        INNER JOIN basic_corp ON pur_plan_detail.supId = basic_corp.erpId
+        left JOIN basic_corp ON pur_plan_detail.supId = basic_corp.erpId
         left join pur_plan on pur_plan.id = pur_plan_detail.orderIdFk
         <where>
             <if test="billNo != null and billNo != ''">