Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2

# Conflicts:
#	jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingNotificationController.java

jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BomMapper.xml

@@ -21,36 +21,36 @@
 
     <select id="getBomList" resultMap="getBomMap">
         SELECT
-        t1.*,
-        t4.NAME AS productName,
-        t4.CODE AS productCode,
-        t4.spec AS productSpec,
-        t5.category_name AS categoryName,
+        a.*,
+        d.NAME AS productName,
+        d.CODE AS productCode,
+        d.spec AS productSpec,
+        e.category_name AS categoryName,
         CASE
-        t4.product_type_id
+        d.product_type_id
         WHEN 1 THEN
         '标品'
         WHEN 2 THEN
         '加工'
         END AS productTypeId,
-        t7.unit_name AS inventoryUnitId
+        g.unit_name AS inventoryUnitId
         FROM
-        jg_bom t1
-        LEFT JOIN jg_bom_item t2 ON t1.id = t2.bom_id
-        AND t2.f_delete_mark
-        IS NULL LEFT JOIN jg_bom_item_value t3 ON t1.id = t3.bom_id
-        AND t3.f_delete_mark
-        IS NULL LEFT JOIN jg_product t4 ON t2.product_id = t4.id
-        AND t4.f_delete_mark
-        IS NULL LEFT JOIN jg_product_category t5 ON t4.product_category_id = t5.id
-        AND t5.f_delete_mark
-        IS NULL LEFT JOIN jg_product_unit t6 ON t6.prouct_id = t4.id
-        AND t6.f_delete_mark
-        IS NULL LEFT JOIN jg_product_unitwarehouse t7 ON t6.product_unitwarehouse_id = t7.id
-        AND t7.f_delete_mark IS NULL
+        jg_bom a
+        LEFT JOIN jg_bom_item b ON a.id = b.bom_id
+        AND b.f_delete_mark
+        IS NULL LEFT JOIN jg_bom_item_value c ON a.id = c.bom_id
+        AND c.f_delete_mark
+        IS NULL LEFT JOIN jg_product d ON b.product_id = d.id
+        AND d.f_delete_mark
+        IS NULL LEFT JOIN jg_product_category e ON d.product_category_id = e.id
+        AND e.f_delete_mark
+        IS NULL LEFT JOIN jg_product_unit f ON f.prouct_id = d.id
+        AND f.f_delete_mark
+        IS NULL LEFT JOIN jg_product_unitwarehouse g ON f.product_unitwarehouse_id = g.id
+        AND g.f_delete_mark IS NULL
         ${ew.customSqlSegment}
         GROUP BY
-        t1.id
+        a.id
         <if test="bomPagination.sidx != null and bomPagination.sidx != ''">
             ORDER BY ${bomPagination.sidx} ${bomPagination.sort}
         </if>

jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessLineMapper.xml

@@ -142,5 +142,16 @@
     </select>
 
 
+    <select id="queryBusinessFactoryTree"  resultMap="businessLine">
+        SELECT
+            a.*
+        FROM
+            jg_business_line a
+
+        WHERE a.f_delete_mark is null
+          and a.organize_json_id like concat('%',#{organize},'%')
+    </select>
+
+
 
 </mapper>

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/BusinessLineMapper.java

@@ -28,4 +28,7 @@ public interface BusinessLineMapper extends BaseMapper<BusinessLineEntity> {
 
     //业务组织配置左树
     List<BusinessLineEntity> queryBusinessOrganizeConfigTree(String organize);
+
+    //工厂基地建模左树添加权限
+    List<BusinessLineEntity> queryBusinessFactoryTree(String organize);
 }

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/BusinessLineService.java

@@ -51,4 +51,8 @@ public interface BusinessLineService extends IService<BusinessLineEntity> {
     int queryUserCountInfo(String id);
     //业务组织配置左树
     List<BusinessLineEntity> queryBusinessOrganizeConfigTree();
+
+
+    //工厂基地建模左树添加权限
+    List<BusinessLineEntity> queryBusinessFactory();
 }

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BomServiceImpl.java

@@ -237,7 +237,7 @@ public class BomServiceImpl extends ServiceImpl<BomMapper, BomEntity> implements
                     JsonUtil.getObjectToString(bomPagination.getBomCode()) :
                     String.valueOf(bomPagination.getBomCode());
 //                bomQueryWrapper.lambda().like(BomEntity::getBomCode,value);
-                bomQueryWrapper.like("t1.BOM_CODE",value);
+                bomQueryWrapper.like("a.BOM_CODE",value);
             }
 
             if(ObjectUtil.isNotEmpty(bomPagination.getProductName())){
@@ -246,7 +246,7 @@ public class BomServiceImpl extends ServiceImpl<BomMapper, BomEntity> implements
                         JsonUtil.getObjectToString(bomPagination.getProductName()) :
                         String.valueOf(bomPagination.getProductName());
 //                bomQueryWrapper.lambda().like(BomEntity::getBomCode,value);
-                bomQueryWrapper.like("t4.NAME",value);
+                bomQueryWrapper.like("d.NAME",value);
             }
 
 
@@ -257,13 +257,13 @@ public class BomServiceImpl extends ServiceImpl<BomMapper, BomEntity> implements
                     JsonUtil.getObjectToString(bomPagination.getBomName()) :
                     String.valueOf(bomPagination.getBomName());
 //                bomQueryWrapper.lambda().like(BomEntity::getBomName,value);
-                bomQueryWrapper.like("t1.BOM_NAME",value);
+                bomQueryWrapper.like("a.BOM_NAME",value);
             }
 
             if(ObjectUtil.isNotEmpty(bomPagination.getBomStatus())){
             bomNum++;
 //        bomQueryWrapper.lambda().eq(BomEntity::getBomStatus,bomPagination.getBomStatus());
-        bomQueryWrapper.eq("t1.BOM_STATUS",bomPagination.getBomStatus());
+        bomQueryWrapper.eq("a.BOM_STATUS",bomPagination.getBomStatus());
 
             }
 
@@ -292,7 +292,7 @@ public class BomServiceImpl extends ServiceImpl<BomMapper, BomEntity> implements
                 intersection.add("jnpfNullList");
             }
 //            bomQueryWrapper.lambda().in(BomEntity::getId, intersection);
-            bomQueryWrapper.in("t1.id", intersection);
+            bomQueryWrapper.in("a.id", intersection);
         }
     //是否有高级查询
         if (StringUtil.isNotEmpty(superOp)){
@@ -300,7 +300,7 @@ public class BomServiceImpl extends ServiceImpl<BomMapper, BomEntity> implements
                 allSuperIDlist.add("jnpfNullList");
             }
             List<String> finalAllSuperIDlist = allSuperIDlist;
-            bomQueryWrapper.and(t->t.in("t1.id", finalAllSuperIDlist));
+            bomQueryWrapper.and(t->t.in("a.id", finalAllSuperIDlist));
 
         }
     //是否有数据过滤查询
@@ -309,15 +309,15 @@ public class BomServiceImpl extends ServiceImpl<BomMapper, BomEntity> implements
                 allRuleIDlist.add("jnpfNullList");
             }
             List<String> finalAllRuleIDlist = allRuleIDlist;
-            bomQueryWrapper.and(t->t.in("t1.id", finalAllRuleIDlist));
+            bomQueryWrapper.and(t->t.in("a.id", finalAllRuleIDlist));
         }
         //假删除标志
-        bomQueryWrapper.isNull("t1.f_delete_mark");
+        bomQueryWrapper.isNull("a.f_delete_mark");
 
         //排序
         if(StringUtil.isEmpty(bomPagination.getSidx())){
 //            bomQueryWrapper.lambda().orderByDesc(BomEntity::getId);
-            bomPagination.setSidx("t1.f_creator_time");
+            bomPagination.setSidx("a.f_creator_time");
             bomPagination.setSort("DESC");
         }else{
             try {
@@ -328,7 +328,7 @@ public class BomServiceImpl extends ServiceImpl<BomMapper, BomEntity> implements
                 declaredField.setAccessible(true);
                 String value = declaredField.getAnnotation(TableField.class).value();
 //                bomQueryWrapper="asc".equals(bomPagination.getSort().toLowerCase())?bomQueryWrapper.orderByAsc(value):bomQueryWrapper.orderByDesc(value);
-                bomPagination.setSidx("t1." + value);
+                bomPagination.setSidx("a." + value);
 
             } catch (NoSuchFieldException e) {
                 e.printStackTrace();

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BusinessLineServiceImpl.java

@@ -708,4 +708,15 @@ public class BusinessLineServiceImpl extends ServiceImpl<BusinessLineMapper, Bus
         organize = organize.replace("]","");
         return businessLineMapper.queryBusinessOrganizeConfigTree(organize);
     }
+
+    @Override
+    public List<BusinessLineEntity> queryBusinessFactory() {
+        UserInfo userInfo=userProvider.get();
+        OrganizeEntity organizeEntity =  organizeService.getInfo(userInfo.getOrganizeId());
+        List<String> organizeJsonId = Arrays.stream(organizeEntity.getCompanyIdTree().split(",")).collect(Collectors.toList());
+        String organize = JSON.toJSONString(organizeJsonId);
+        organize = organize.replace("[","");
+        organize = organize.replace("]","");
+        return businessLineMapper.queryBusinessFactoryTree(organize);
+    }
 }

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingInventoryServiceImpl.java

@@ -30,6 +30,9 @@ import jnpf.util.*;
 import java.util.*;
 import jnpf.base.UserInfo;
 import jnpf.permission.entity.UserEntity;
+
+import javax.annotation.Resource;
+
 /**
  *
  * warehousingInventory
@@ -48,7 +51,7 @@ public class WarehousingInventoryServiceImpl extends ServiceImpl<WarehousingInve
 
     @Autowired
     private WarehousingInventoryProductService warehousingInventoryProductService;
-    @Autowired
+    @Resource
     private WarehousingInventoryMapper warehousingInventoryMapper;
     @Override
     public List<WarehousingInventoryEntity> getList(WarehousingInventoryPagination warehousingInventoryPagination){

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WorkOrderServiceImpl.java

@@ -835,8 +835,8 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
             if (intersection.size()==0){
                 intersection.add("jnpfNullList");
             }
-//            workOrderQueryWrapper.lambda().in(WorkOrderEntity::getId, intersection);
-            workOrderQueryWrapper.in("a.id", intersection);
+            workOrderQueryWrapper.lambda().in(WorkOrderEntity::getId, intersection);
+//            workOrderQueryWrapper.in("a.id", intersection);
         }
         //是否有高级查询
         if (StringUtil.isNotEmpty(superOp)){

jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessLineController.java

@@ -1,6 +1,7 @@
 package jnpf.controller;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
 import com.aliyun.credentials.utils.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -16,6 +17,7 @@ import jnpf.permission.entity.OrganizeEntity;
 import jnpf.permission.entity.UserEntity;
 import jnpf.permission.model.organize.OrganizeModel;
 import jnpf.permission.model.organize.OrganizeTreeVO;
+import jnpf.permission.service.OrganizeService;
 import jnpf.service.*;
 import jnpf.entity.*;
 import jnpf.util.*;
@@ -67,6 +69,8 @@ public class BusinessLineController {
     private BusinessAddressService businessAddressService;
     @Autowired
     private BusinessCargoService businessCargoService;
+    @Autowired
+    private OrganizeService organizeService;
 
 
     /**
@@ -92,7 +96,10 @@ public class BusinessLineController {
     @Operation(summary = "获取工厂和加工车间树形树形")
     @GetMapping("/WorkTree")
     public ActionResult<List<BusinessLineSonTree>> WorkTree() {
-        List<BusinessLineEntity> list = businessLineService.list();
+
+
+//        List<BusinessLineEntity> list = businessLineService.list();
+        List<BusinessLineEntity> list = businessLineService.queryBusinessFactory();
         List<BusinessLineEntity> workTreeList =new ArrayList<>();
         for (BusinessLineEntity businessLineEntity:list){
             if (businessLineEntity.getDiffFlag().equals("2")||businessLineEntity.getDiffFlag().equals("5")){

jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/ProductWarehouseController.java

@@ -145,6 +145,7 @@ public class ProductWarehouseController {
     @Operation(summary = "加工和bom获取商品列表")
     @PostMapping("/getBomProductlist")
     public ActionResult bomProductlist(@RequestBody ProductWarehousePagination productWarehousePagination)throws IOException{
+        productWarehousePagination.setMenuId("522017337285542021");
         List<ProductWarehouseEntity> list= productWarehouseService.getProductList(productWarehousePagination);
         List<Map<String, Object>> realList = new ArrayList<>();
         for (ProductWarehouseEntity entity : list) {
@@ -224,6 +225,7 @@ public class ProductWarehouseController {
     @Operation(summary = "盘点单根据库存取商品列表")
     @PostMapping("/getInventoryLProductlist")
     public ActionResult inventoryLProductlist(@RequestBody ProductWarehousePagination productWarehousePagination)throws IOException{
+        productWarehousePagination.setMenuId("522017337285542021");
         List<ProductWarehouseEntity> list= productWarehouseService.getProductInventoryList(productWarehousePagination);
         List<Map<String, Object>> realList=new ArrayList<>();
         for (ProductWarehouseEntity entity : list) {
@@ -394,6 +396,7 @@ public class ProductWarehouseController {
     @Operation(summary = "报损单根据库存获取商品")
     @PostMapping("/postInventoryReportlossProductlist")
     public ActionResult InventoryReportlossProductlist(@RequestBody ProductWarehousePagination productWarehousePagination) throws IOException{
+        productWarehousePagination.setMenuId("522017337285542021");
         List<ProductWarehouseEntity> list= productWarehouseService.getProductInventoryReportlossList(productWarehousePagination);
         List<Map<String, Object>> realList=new ArrayList<>();
         for (ProductWarehouseEntity entity : list) {

jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/SubjectbasicController.java

@@ -1,17 +1,9 @@
 package jnpf.controller;
 
-import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jnpf.base.ActionResult;
 import jnpf.base.UserInfo;
-import jnpf.exception.DataException;
-import jnpf.model.yunguan.YunguanCustomerModel;
-import jnpf.permission.entity.OrganizeEntity;
-import jnpf.permission.entity.UserEntity;
 import jnpf.permission.service.OrganizeService;
 import jnpf.service.*;
 import jnpf.entity.*;
@@ -22,39 +14,23 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.ServletException;
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
-import java.math.BigDecimal;
-import java.nio.charset.StandardCharsets;
 import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.*;
-import jnpf.annotation.JnpfField;
 import jnpf.base.vo.PageListVO;
 import jnpf.base.vo.PaginationVO;
 import jnpf.base.vo.DownloadVO;
 import jnpf.config.ConfigValueUtil;
-import jnpf.base.entity.ProvinceEntity;
 import java.io.IOException;
-import java.util.stream.Collectors;
 import jnpf.engine.entity.FlowTaskEntity;
 import jnpf.exception.WorkFlowException;
 import org.springframework.web.multipart.MultipartFile;
 import cn.afterturn.easypoi.excel.ExcelExportUtil;
-import cn.afterturn.easypoi.excel.ExcelImportUtil;
 import cn.afterturn.easypoi.excel.entity.ExportParams;
-import cn.afterturn.easypoi.excel.entity.ImportParams;
 import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
 import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Workbook;
-import java.io.File;
-import jnpf.onlinedev.model.ExcelImFieldModel;
-import jnpf.onlinedev.model.OnlineImport.ImportDataModel;
-import jnpf.onlinedev.model.OnlineImport.ImportFormCheckUniqueModel;
-import jnpf.onlinedev.model.OnlineImport.ExcelImportModel;
-import jnpf.onlinedev.model.OnlineImport.VisualImportModel;
 import cn.xuyanwu.spring.file.storage.FileInfo;
 import lombok.Cleanup;
 import jnpf.model.visualJson.config.HeaderModel;
@@ -111,7 +87,7 @@ public class SubjectbasicController {
     */
     @Operation(summary = "获取列表")
     @PostMapping("/getList")
-    public ActionResult list(@RequestBody SubjectbasicPagination subjectbasicPagination) throws IOException, ServletException {
+    public ActionResult list(@RequestBody SubjectbasicPagination subjectbasicPagination) throws IOException, ServletException, ParseException {
         List<SubjectbasicEntity> list= subjectbasicService.getList(subjectbasicPagination);
         List<Map<String, Object>> realList=new ArrayList<>();
         for (SubjectbasicEntity entity : list) {
@@ -765,183 +741,4 @@ public class SubjectbasicController {
         return ActionResult.success(subjectbasicMap);
     }
 
-    public ActionResult syncContractHead(HttpServletRequest httpRequest) throws IOException {
-        /*ServletInputStream inputStream = httpRequest.getInputStream();
-        byte[] bytes = new byte[httpRequest.getContentLength()];
-        inputStream.read(bytes);
-        String str = new String(bytes, StandardCharsets.UTF_8);
-        System.out.println(str);*/
-        String str = "{\"CURRENCY_TY\":\"CNY\",\"CONTR_TY\":\"01\",\"ORG_NM\":\"JT1济钢集团有限公司广东分公司\",\"ID\":\"15A1FA661049C68BE0634A0110AC7D40\",\"CANCLE_YN\":\"0\",\"DEPT_CD\":\"1101160\",\"CONTR_CD\":\"11011600124040802\",\"ESB_STATUS\":\"N\",\"COMP_CD\":\"1101\",\"SUPPLIER_SITE_ID\":\"296134\",\"ESB_DTM\":\"2024-04-25T14:48:41\",\"CREATE_EMP_ID\":\"33F6989D2A574057BDB8E3C31741CC8B\",\"CONTR_FORM\":\"1\",\"CREATE_DTM\":\"2024-04-08T00:00:00\",\"SUPPLIER_NM\":\"安徽省茂鑫金属制品有限公司\",\"REMARK\":\"加盖合同章时已并加盖广东分公司负责人签名章\",\"CONTR_INSTANCE_STATUS\":\"普通审批结束\",\"DEPT_NM\":\"广东分公司\",\"CONTR_NO\":\"JGGDFGA2403185\",\"ESB_MESSAGE\":\"Success\",\"DELV_DATE\":\"2024-04-20T00:00:00\",\"RESERVE9\":\"否\",\"MODIFY_DTM\":\"2024-04-08T15:46:54\",\"MODIFY_EMP_ID\":\"33F6989D2A574057BDB8E3C31741CC8B\",\"RESERVE5\":\"否\",\"RESERVE4\":\"废钢类\",\"SUPPLIER_CD\":\"234000067\",\"RESERVE3\":\"否\",\"CONTR_NM\":\"废不锈钢买卖合同（第贰拾捌批次)JGGDFGA2403185\",\"RESERVE2\":\"500.000\",\"STOCK_TYPE\":\"A\",\"CONTR_PRICE\":\"2388475\",\"RESERVE17\":\"钢贸一部\",\"RESERVE15\":\"否\",\"TRADE_TYPE\":\"B\",\"ORG_CD\":\"JT1\",\"CONTR_EX_RATE\":\"1\"}";
-        JSONObject jsonObject = JSON.parseObject(str);
-
-
-        return ActionResult.success("运管推送合同信息到智慧成功");
-    }
-
-    public ActionResult syncSupplier(HttpServletRequest httpRequest) throws IOException, ServletException, ParseException {
-        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
-        /*ServletInputStream inputStream = httpRequest.getInputStream();
-        byte[] bytes = new byte[httpRequest.getContentLength()];
-        inputStream.read(bytes);
-        String str = new String(bytes, StandardCharsets.UTF_8);
-        System.out.println(str);*/
-        String str = "{\"ID\":\"FFA0B9F0396338FFE0534A0110AC753D\",\"ESB_STATUS\":\"N\",\"ESB_DTM\":\"2024-04-25T13:34:40\",\"ATTRIBUTE6\":\"231084\",\"VENDOR_SITE_CODE\":\"国贸部\",\"ADD_ID\":\"SYSTEM\",\"ORG_NAME\":\"山钢集团江苏经贸有限公司\",\"CANCEL_FLAG\":\"0\",\"VENDOR_NUM\":\"300000193\",\"MODIFY_ID\":\"SYSTEM\",\"INTF_STATUS\":\"S\",\"VENDOR_NAME\":\"TURNING RESOURCES PRIVATE LIMITED\",\"ORG_ID\":\"1004\",\"MODIFY_TIME\":\"2023-08-03T10:34:33\",\"BELONG_ID\":\"D\",\"ESB_MESSAGE\":\"没有权限操作\",\"ATTR1\":\"A级\",\"ATTR4\":\"1004\",\"READ_FLAG\":\"N\",\"ATTR3\":\"JT3\",\"ADD_TIME\":\"2023-07-04T10:07:24\"}";
-        JSONObject jsonObject = JSON.parseObject(str);
-        ContractLEntity contractLEntity = new ContractLEntity();
-        contractLEntity.setCurrency(jsonObject.get("CURRENCY_TY").toString());//币种
-        contractLEntity.setContractType(jsonObject.get("CONTR_TY").toString());
-        if(ObjectUtil.equal("01", jsonObject.get("CONTR_TY").toString())){
-            contractLEntity.setContractType("1");
-        }else if(ObjectUtil.equal("02", jsonObject.get("CONTR_TY").toString())){
-            contractLEntity.setContractType("2");
-        }
-        contractLEntity.setContractNumber(jsonObject.get("CONTR_CD").toString());
-        contractLEntity.setContractNo(jsonObject.get("CONTR_NO").toString());
-        contractLEntity.setSupplierSiteId(jsonObject.get("SUPPLIER_SITE_ID").toString());
-        contractLEntity.setSupplierSiteName(jsonObject.get("RESERVE17").toString());
-        contractLEntity.setRemark(jsonObject.get("REMARK").toString());
-        contractLEntity.setContrForm(jsonObject.get("CONTR_FORM").toString());
-        Date parse = dateFormat.parse(jsonObject.get("DELV_DATE").toString());
-        contractLEntity.setDeliveryTime(parse);
-        contractLEntity.setReserve4(jsonObject.get("RESERVE4").toString());
-        contractLEntity.setReserve5(jsonObject.get("RESERVE5").toString());
-        contractLEntity.setReserve9(jsonObject.get("RESERVE9").toString());
-        contractLEntity.setContractName(jsonObject.get("CONTR_NM").toString());
-        contractLEntity.setReserve2(jsonObject.get("RESERVE2").toString());
-        contractLEntity.setReserve3(jsonObject.get("RESERVE3").toString());
-        contractLEntity.setStockType(jsonObject.get("STOCK_TYPE").toString());
-        contractLEntity.setTotalAmount(new BigDecimal(jsonObject.get("CONTR_PRICE").toString()));
-        if(ObjectUtil.equal("否", jsonObject.get("RESERVE15").toString())){
-            contractLEntity.setIsLongAgreement("2");
-        }else {
-            contractLEntity.setIsLongAgreement("1");
-        }
-        if(ObjectUtil.equal("B", jsonObject.get("TRADE_TYPE").toString())){
-            contractLEntity.setProcurementModel("2");
-        }else {
-            contractLEntity.setProcurementModel("1");
-        }
-        contractLEntity.setKucunOrgCode(jsonObject.get("ORG_CD").toString());//库存组织编码
-        if(ObjectUtil.equal("CK0", contractLEntity.getKucunOrgCode())){
-            contractLEntity.setKucunOrgName("济钢城市矿产科技有限公司");
-        }else if(ObjectUtil.equal("CK1", contractLEntity.getKucunOrgCode())){
-            contractLEntity.setKucunOrgName("济钢城市矿产科技有限公司(日照)");
-        }else if(ObjectUtil.equal("CK2", contractLEntity.getKucunOrgCode())){
-            contractLEntity.setKucunOrgName("山东济钢愿景工业科技有限公司");
-        }else if(ObjectUtil.equal("CK3", contractLEntity.getKucunOrgCode())){
-            contractLEntity.setKucunOrgName("济钢城市矿产科技（佛山）有限公司");
-        }else if(ObjectUtil.equal("RJ0", contractLEntity.getKucunOrgCode())){
-            contractLEntity.setKucunOrgName("日照济钢金属科技有限公司");
-        }else if(ObjectUtil.equal("RJ1", contractLEntity.getKucunOrgCode())){
-            contractLEntity.setKucunOrgName("日照济钢金属科技有限公司(生产)");
-        }else if(ObjectUtil.equal("JT1", contractLEntity.getKucunOrgCode())){
-            contractLEntity.setKucunOrgName("济钢集团有限公司广东分公司");
-        }
-        QueryWrapper<OrganizeEntity> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(OrganizeEntity::getEnCode, jsonObject.get("DEPT_CD").toString());
-        List<OrganizeEntity> orgList = organizeService.list(queryWrapper);
-        if(orgList != null && orgList.size() > 0){
-            List<String> conpanyIdList = Arrays.asList(orgList.get(0).getCompanyIdTree().split(","));
-            String organizeId = JSON.toJSONString(conpanyIdList);
-            contractLEntity.setOrganizeJsonId(organizeId);//分支机构编码
-        }
-        jsonObject.get("SUPPLIER_CD").toString();
-        QueryWrapper<SubjectbasicEntity> subjectbasicQueryWrapper = new QueryWrapper<>();
-        subjectbasicQueryWrapper.lambda().eq(SubjectbasicEntity::getCode, jsonObject.get("SUPPLIER_CD").toString());
-        subjectbasicQueryWrapper.lambda().isNull(SubjectbasicEntity::getDeleteMark);
-        List<SubjectbasicEntity> subjectbasicList = subjectbasicService.list(subjectbasicQueryWrapper);
-        if(subjectbasicList != null && subjectbasicList.size() > 0){
-            contractLEntity.setSubject(subjectbasicList.get(0).getId());
-        }
-        contractLService.save(contractLEntity);
-        return ActionResult.success("运管推送供应商数据到智慧成功");
-    }
-
-    public ActionResult syncCustomer() throws IOException, ServletException {
-        /*ServletInputStream inputStream = httpRequest.getInputStream();
-        byte[] bytes = new byte[httpRequest.getContentLength()];
-        inputStream.read(bytes);
-        String str = new String(bytes, StandardCharsets.UTF_8);*/
-        String str = "{\"CUST_FULL_NAME\":\"SOCIETE PROMETAL SARL\",\"ID\":\"FF9F8D24DA93F45DE0534A0110AC4F09\",\"CUST_NUMBER\":\"900000076\",\"ESB_STATUS\":\"N\",\"ESB_DTM\":\"2024-04-23T16:55:32\",\"ORGANIZATION_CODE\":\"RJ1\",\"ADD_ID\":\"SYSTEM\",\"CANCEL_FLAG\":\"0\",\"INTF_STATUS\":\"S\",\"OU_NAME\":\"济钢供应链（济南）有限公司\",\"BELONG_ID\":\"D\",\"ESB_MESSAGE\":\"验证请求超时\",\"ATTR2\":\"A级\",\"ATTR1\":\"1304\",\"READ_FLAG\":\"N\",\"ATTR3\":\"1104040\",\"ADD_TIME\":\"2023-07-04T08:42:11\"}";
-        System.out.println(str);
-        JSONObject jsonObject = JSON.parseObject(str);
-        if(!ObjectUtil.equal(jsonObject.get("INTF_STATUS").toString(), "S")){
-            return ActionResult.fail("请推送状态为S的客户");
-        }
-        SubjectbasicEntity subjectbasicEntity = new SubjectbasicEntity();
-        subjectbasicEntity.setName(jsonObject.get("CUST_FULL_NAME").toString());//名称
-        subjectbasicEntity.setCalssify("1");//一级
-        subjectbasicEntity.setSubjectBasicType("1");//客户
-        subjectbasicEntity.setCode(jsonObject.get("CUST_NUMBER").toString());//编码
-        subjectbasicEntity.setKucunOrgCode(jsonObject.get("ORGANIZATION_CODE").toString());//库存组织编码
-        if(ObjectUtil.equal("CK0", subjectbasicEntity.getKucunOrgCode())){
-            subjectbasicEntity.setKucunOrgName("济钢城市矿产科技有限公司");
-        }else if(ObjectUtil.equal("CK1", subjectbasicEntity.getKucunOrgCode())){
-            subjectbasicEntity.setKucunOrgName("济钢城市矿产科技有限公司(日照)");
-        }else if(ObjectUtil.equal("CK2", subjectbasicEntity.getKucunOrgCode())){
-            subjectbasicEntity.setKucunOrgName("山东济钢愿景工业科技有限公司");
-        }else if(ObjectUtil.equal("CK3", subjectbasicEntity.getKucunOrgCode())){
-            subjectbasicEntity.setKucunOrgName("济钢城市矿产科技（佛山）有限公司");
-        }else if(ObjectUtil.equal("RJ0", subjectbasicEntity.getKucunOrgCode())){
-            subjectbasicEntity.setKucunOrgName("日照济钢金属科技有限公司");
-        }else if(ObjectUtil.equal("RJ1", subjectbasicEntity.getKucunOrgCode())){
-            subjectbasicEntity.setKucunOrgName("日照济钢金属科技有限公司(生产)");
-        }else if(ObjectUtil.equal("JT1", subjectbasicEntity.getKucunOrgCode())){
-            subjectbasicEntity.setKucunOrgName("济钢集团有限公司广东分公司");
-        }
-        if(ObjectUtil.equal("A级", jsonObject.get("ATTR2").toString())){
-            subjectbasicEntity.setReservedFields3("1");
-        }else if(ObjectUtil.equal("B级", jsonObject.get("ATTR2").toString())){
-            subjectbasicEntity.setReservedFields3("2");
-        }else if(ObjectUtil.equal("C级", jsonObject.get("ATTR2").toString())){
-            subjectbasicEntity.setReservedFields3("3");
-        }else if(ObjectUtil.equal("D级", jsonObject.get("ATTR2").toString())){
-            subjectbasicEntity.setReservedFields3("4");
-        }
-        QueryWrapper<OrganizeEntity> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(OrganizeEntity::getEnCode, jsonObject.get("ATTR3").toString());
-        List<OrganizeEntity> orgList = organizeService.list(queryWrapper);
-        if(orgList != null && orgList.size() > 0){
-            List<String> conpanyIdList = Arrays.asList(orgList.get(0).getCompanyIdTree().split(","));
-            String organizeId = JSON.toJSONString(conpanyIdList);
-            subjectbasicEntity.setOrganizeJsonId(organizeId);//分支机构编码
-        }
-        subjectbasicService.save(subjectbasicEntity);
-        return ActionResult.success("运管推送客户数据到智慧成功");
-    }
-
-    public ActionResult syncContractLine(HttpServletRequest httpRequest) throws IOException {
-        /*ServletInputStream inputStream = httpRequest.getInputStream();
-        byte[] bytes = new byte[httpRequest.getContentLength()];
-        inputStream.read(bytes);
-        String str = new String(bytes, StandardCharsets.UTF_8);
-        System.out.println(str);*/
-        String str = "{\"ITEM_NM\":\"400系废不锈钢(430胶纸料)\",\"TAX_PRICE\":\"4776.95\",\"TAX_RATE\":\"13\",\"CONTR_ID\":\"158D8934E4A9961EE063480110AC94BE\",\"UOM\":\"吨\",\"CONTR_LINE_ID\":\"01\",\"PRICE\":\"4227.3893805309\",\"ID\":\"15A1FA66104AC68BE0634A0110AC7D40\",\"TAX_RATE_CODE\":\"VAT_IN_13\",\"AMOUNT\":\"2113694.69\",\"RESERVE1\":\"正算\",\"WEIGHT\":\"500\",\"CANCLE_YN\":\"1\",\"ITEM_CD\":\"1011110110FG01000G0318\",\"CONTR_CD\":\"11011600124040802\",\"TOTAL_AMOUNT\":\"2388475\",\"ESB_STATUS\":\"N\",\"CREATE_EMP_ID\":\"33F6989D2A574057BDB8E3C31741CC8B\",\"CREATE_DTM\":\"2024-04-08T15:46:35\"}";
-        JSONObject jsonObject = JSON.parseObject(str);
-        ContractLCommodityEntity contractLCommodityEntity = new ContractLCommodityEntity();
-        QueryWrapper<ContractLEntity> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(ContractLEntity::getContractNumber, jsonObject.get("CONTR_CD").toString());
-        List<ContractLEntity> contractLEntityList = contractLService.list(queryWrapper);
-        if(contractLEntityList != null && contractLEntityList.size() > 0){
-            contractLCommodityEntity.setContractId(contractLEntityList.get(0).getId());
-            contractLCommodityEntity.setOrganizeJsonId(contractLEntityList.get(0).getOrganizeJsonId());
-        }
-        QueryWrapper<ProductWarehouseEntity> productWarehouseEntityWrapper = new QueryWrapper<>();
-        productWarehouseEntityWrapper.lambda().eq(ProductWarehouseEntity::getCode, jsonObject.get("ITEM_CD").toString());
-        List<ProductWarehouseEntity> productWarehouseEntityList = productWarehouseService.list(productWarehouseEntityWrapper);
-        if(productWarehouseEntityList != null && productWarehouseEntityList.size() > 0){
-            contractLCommodityEntity.setProductId(productWarehouseEntityList.get(0).getId());
-            contractLCommodityEntity.setCommodityCode(jsonObject.get("ITEM_CD").toString());
-            contractLCommodityEntity.setCommodityName(jsonObject.get("ITEM_NM").toString());
-            contractLCommodityEntity.setCommodityPhone(productWarehouseEntityList.get(0).getPhoto());
-            contractLCommodityEntity.setSpecifications(productWarehouseEntityList.get(0).getSpec());
-            contractLCommodityEntity.setInventoryUnitId(productWarehouseEntityList.get(0).getInventoryUnitId());
-        }
-        contractLCommodityEntity.setNumber(new BigDecimal(jsonObject.get("WEIGHT").toString()));
-        contractLCommodityEntity.setTaxRate(new BigDecimal(jsonObject.get("TAX_RATE").toString()));
-        contractLCommodityEntity.setPriceRate(new BigDecimal(jsonObject.get("TAX_PRICE").toString()));
-        contractLCommodityEntity.setTotalRate(new BigDecimal(jsonObject.get("TOTAL_AMOUNT").toString()));
-        contractLCommodityService.save(contractLCommodityEntity);
-        return ActionResult.success("运管推送合同信息到智慧成功");
-    }
 }

jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingNotificationController.java

@@ -1,6 +1,7 @@
 package jnpf.controller;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -11,7 +12,9 @@ import jnpf.engine.service.FlowTaskNodeService;
 import jnpf.engine.service.FlowTaskService;
 import jnpf.exception.DataException;
 import jnpf.model.voucher.VoucherPagination;
+import jnpf.permission.entity.OrganizeEntity;
 import jnpf.permission.entity.UserEntity;
+import jnpf.permission.service.OrganizeService;
 import jnpf.service.*;
 import jnpf.entity.*;
 import jnpf.util.*;
@@ -86,6 +89,8 @@ public class WarehousingNotificationController {
     private BusinessCargoService businessCargoService;
     @Autowired
     private ReturnCargoOrderService returnCargoOrderService;
+    @Autowired
+    private OrganizeService organizeService;
 
 
     @Autowired
@@ -684,10 +689,18 @@ public class WarehousingNotificationController {
     @Operation(summary = "获取Notification选择的凭证和商品列表")
     @PostMapping("/getNotificationVoucherProductList")
     public ActionResult queryNotificationVoucherProductList(@RequestBody VoucherPagination voucherPagination) throws IOException{
+        UserInfo userInfo=userProvider.get();
+        OrganizeEntity organizeEntity =  organizeService.getInfo(userInfo.getOrganizeId());
+        List<String> organizeJsonId = Arrays.stream(organizeEntity.getCompanyIdTree().split(",")).collect(Collectors.toList());
+        String organize = JSON.toJSONString(organizeJsonId);
+        organize = organize.replace("[","");
+        organize = organize.replace("]","");
             String id =  voucherPagination.getNotid();
             QueryWrapper<WarehousingProductEntity> warehousingProductEntityQueryWrapper=new QueryWrapper<>();
             warehousingProductEntityQueryWrapper.lambda().eq(WarehousingProductEntity::getWarehousingId,id);
-            List<WarehousingProductEntity> warehousingProductEntityList = warehousingProductService.list(warehousingProductEntityQueryWrapper);
+            warehousingProductEntityQueryWrapper.like("organize_json_id",organize);
+
+        List<WarehousingProductEntity> warehousingProductEntityList = warehousingProductService.list(warehousingProductEntityQueryWrapper);
             List<VoucherEntity> list=new ArrayList<>();
             for (WarehousingProductEntity warehousingProductEntity:warehousingProductEntityList){
 

jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingReceiveController.java

@@ -613,6 +613,7 @@ public class WarehousingReceiveController {
         WorkOrderPagination workOrderPagination = new WorkOrderPagination();
         workOrderPagination.setWarehouseId(warehouseId);
 
+        workOrderPagination.setMenuId("523106990231139333");
         List<WorkOrderEntity> list = workOrderService.getReceiveList(workOrderPagination);
         for (WorkOrderEntity entity : list) {
             Map<String, Object> workOrderMap = JsonUtil.entityToMap(entity);

jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingReturnController.java

@@ -1,6 +1,7 @@
 package jnpf.controller;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -13,7 +14,9 @@ import jnpf.exception.DataException;
 import jnpf.model.warehousingstorage.WarehousingStorageForm;
 import jnpf.model.warehousingstorage.WarehousingStorageProductModel;
 import jnpf.model.workorder.WorkOrderPrimaryModel;
+import jnpf.permission.entity.OrganizeEntity;
 import jnpf.permission.entity.UserEntity;
+import jnpf.permission.service.OrganizeService;
 import jnpf.service.*;
 import jnpf.entity.*;
 import jnpf.util.*;
@@ -98,6 +101,8 @@ public class WarehousingReturnController {
     private WarehousingStorageService warehousingStorageService;
     @Autowired
     private InventoryLogService inventoryLogService;
+    @Autowired
+    private OrganizeService organizeService;
 
     @Autowired
     private ConfigValueUtil configValueUtil;
@@ -607,8 +612,17 @@ public class WarehousingReturnController {
     @GetMapping("/getreturnReceiveList")
     public ActionResult returnReceiveList(@RequestParam("warehouseId") String warehouseId) throws IOException{
 //        if (businessType.equals("1")){
-            QueryWrapper<WarehousingReceiveEntity> warehousingReturnEntityQueryWrapper =new QueryWrapper<>();
-            warehousingReturnEntityQueryWrapper.lambda().eq(WarehousingReceiveEntity::getWarehouseId,warehouseId);
+
+        UserInfo userInfo=userProvider.get();
+        OrganizeEntity organizeEntity =  organizeService.getInfo(userInfo.getOrganizeId());
+        List<String> organizeJsonId = Arrays.stream(organizeEntity.getCompanyIdTree().split(",")).collect(Collectors.toList());
+        String organize = JSON.toJSONString(organizeJsonId);
+        organize = organize.replace("[","");
+        organize = organize.replace("]","");
+        QueryWrapper<WarehousingReceiveEntity> warehousingReturnEntityQueryWrapper =new QueryWrapper<>();
+        warehousingReturnEntityQueryWrapper.like("organize_json_id",organize);
+        warehousingReturnEntityQueryWrapper.lambda().eq(WarehousingReceiveEntity::getWarehouseId,warehouseId);
+
             List<WarehousingReceiveEntity> warehousingReceiveEntityList =warehousingReceiveService.list(warehousingReturnEntityQueryWrapper);
 
             for (WarehousingReceiveEntity warehousingReceiveEntity:warehousingReceiveEntityList){

jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/YunguanInterfaceController.java

@@ -199,7 +199,7 @@ public class YunguanInterfaceController {
         System.out.println(str);
         JSONObject jsonObject = JSON.parseObject(str);
         ContractLEntity contractLEntity = new ContractLEntity();
-        contractLEntity.setCurrency(jsonObject.get("CURRENCY_TY").toString());//币种
+        contractLEntity.setCurrency("1");//币种
         contractLEntity.setContractType(jsonObject.get("CONTR_TY").toString());
         if(ObjectUtil.equal("01", jsonObject.get("CONTR_TY").toString())){
             contractLEntity.setContractType("1");
@@ -256,7 +256,6 @@ public class YunguanInterfaceController {
             String organizeId = JSON.toJSONString(conpanyIdList);
             contractLEntity.setOrganizeJsonId(organizeId);//分支机构编码
         }
-        jsonObject.get("SUPPLIER_CD").toString();
         QueryWrapper<SubjectbasicEntity> subjectbasicQueryWrapper = new QueryWrapper<>();
         subjectbasicQueryWrapper.lambda().eq(SubjectbasicEntity::getCode, jsonObject.get("SUPPLIER_CD").toString());
         subjectbasicQueryWrapper.lambda().isNull(SubjectbasicEntity::getDeleteMark);

jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/DriverGoodsBox.vue

@@ -1,16 +1,18 @@
 <template>
-  <el-dialog title="选择数据" :close-on-click-modal="false" :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center"
-    lock-scroll append-to-body width="800px">
+  <el-dialog title="选择数据" :close-on-click-modal="false" :visible.sync="visible"
+    class="JNPF-dialog JNPF-dialog_center" lock-scroll append-to-body width="800px">
     <el-row class="JNPF-common-search-box" :gutter="16">
       <el-form @submit.native.prevent>
         <el-col :span="10">
           <el-form-item label="关键词">
-            <el-input v-model="keyword" placeholder="请输入关键词查询" clearable @keyup.enter.native="search()" />
+            <el-input v-model="keyword" placeholder="请输入关键词查询" clearable
+              @keyup.enter.native="search()" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item>
-            <el-button type="primary" icon="el-icon-search" @click="search()">{{ $t('common.search') }}
+            <el-button type="primary" icon="el-icon-search"
+              @click="search()">{{ $t('common.search') }}
             </el-button>
             <el-button icon="el-icon-refresh-right" @click="refresh()">{{ $t('common.reset') }}
             </el-button>
@@ -19,11 +21,13 @@
       </el-form>
       <div class="JNPF-common-search-box-right">
         <el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
-          <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="search()" />
+          <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
+            @click="search()" />
         </el-tooltip>
       </div>
     </el-row>
-    <JNPF-table v-loading="listLoading" :data="list" hasC @selection-change="handleSelectionChange" :border="false">
+    <JNPF-table v-loading="listLoading" :data="list" hasC @selection-change="handleSelectionChange"
+      :border="false">
       <el-table-column prop="name" label="名称" align="left">
       </el-table-column>
       <el-table-column prop="mobile" label="驾驶员电话" align="left">
@@ -33,7 +37,8 @@
       <el-table-column prop="sex" label="性别" align="left">
       </el-table-column>
     </JNPF-table>
-    <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="init" />
+    <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
+      @pagination="init" />
     <span slot="footer" class="dialog-footer">
       <el-button @click="visible = false">{{ $t('common.cancelButton') }}</el-button>
       <el-button type="primary" @click="select()">{{ $t('common.confirmButton') }}</el-button>
@@ -77,6 +82,8 @@ export default {
         keyword: this.keyword,
         excludeIdList: this.excludeIdList,
         dataType: 0,
+        menuId: '531495963697634693'
+
       }
       /* GoodsList(query).then(res => {
         this.list = res.data.list
@@ -120,7 +127,7 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
->>>.el-dialog__body {
+>>> .el-dialog__body {
   height: 70vh;
   padding: 0 0 10px !important;
   display: flex;

jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/VehicleGoodsBox.vue

@@ -84,6 +84,8 @@ export default {
         keyword: this.keyword,
         excludeIdList: this.excludeIdList,
         dataType: 0,
+        menuId: '531496192027155845'
+
       }
       /* GoodsList(query).then(res => {
         this.list = res.data.list

jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingreturn/form.vue

@@ -77,7 +77,8 @@
             </div> -->
 
             <div>
-              <jnpf-form-tip-item label="关联单据" v-if="judgeShow('businessId')" prop="businessId">
+              <jnpf-form-tip-item label="关联单据"
+                v-if="judgeShow('businessId') && dataForm.businessType==1" prop="businessId">
                 <JnpfPopupSelect v-model="dataForm.businessId" @change="changeDataOrder"
                   :rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.businessId"
                   placeholder="请选择" hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据"
@@ -87,7 +88,8 @@
                 </JnpfPopupSelect>
               </jnpf-form-tip-item>
 
-              <!-- <jnpf-form-tip-item label="关联单据" v-if="judgeShow('businessId')" prop="businessId">
+              <jnpf-form-tip-item label="关联单据"
+                v-if="judgeShow('businessId') && dataForm.businessType==2" prop="businessId">
                 <JnpfPopupSelect v-model="dataForm.businessId" @change="changeDataOrder"
                   :rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.businessId"
                   placeholder="请选择" hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据"
@@ -95,7 +97,7 @@
                   interfaceId="550333831945675973" :pageSize="20"
                   :columnOptions="businessIdcolumnOptions" clearable :style='{ "width": "100%" }'>
                 </JnpfPopupSelect>
-              </jnpf-form-tip-item> -->
+              </jnpf-form-tip-item>
             </div>
 
           </el-col>
@@ -404,7 +406,7 @@ export default {
       warehouseIdcolumnOptions: [{ "label": "仓库名称", "value": "name" }, { "label": "仓库编码", "value": "code" },],
       returnReasonOptions: [{ "fullName": "质量问题", "id": "1" }, { "fullName": "客户退回", "id": "2" }, { "fullName": "试用", "id": "3" }, { "fullName": "临期报废", "id": "4" }, { "fullName": "维修", "id": "5" }, { "fullName": "保养", "id": "6" }, { "fullName": "作业工具", "id": "7" }, { "fullName": "其他", "id": "8" }],
       returnReasonProps: { "label": "fullName", "value": "id" },
-      businessIdcolumnOptions: [{ "label": "领用单编号", "value": "receiveCode" }],
+      businessIdcolumnOptions: [{ "label": "领用单编号", "value": "receiveCode" }, { "label": "关联单据", "value": "businessId" }],
       warehousingreturnproductproductIdcolumnOptions: [{ "label": "商品名称", "value": "name" }, { "label": "规格", "value": "spec" }, { "label": "批次号", "value": "batchNumber" },],
       warehousingreturnproductreturnUnitcolumnOptions: [{ "label": "单位名称", "value": "unit_name" },],
       warehousingreturnproductcargoIdcolumnOptions: [{ "label": "货区名称", "value": "cargo_name" }, { "label": "描述", "value": "description" }],