采购销售页面优化

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

@@ -6,11 +6,13 @@
     <select id="queryOrganizeCount" resultType="Integer">
         select count(0) from jg_business_enterprise_relational a
         where a.business_line_id = #{id}
+            and a.organize_json_id like concat('%',#{organize},'%')
     </select>
 
     <select id="queryUserCount" resultType="Integer">
         select count(0) from jg_business_user_relational a
         where a.business_line_id = #{id}
+          and a.organize_json_id like concat('%',#{organize},'%')
     </select>
 
     <resultMap id="businessLine" type="jnpf.entity.BusinessLineEntity">
@@ -136,6 +138,7 @@
                 LEFT JOIN ( SELECT * FROM base_dictionary_data WHERE f_dictionary_type_id = '517958847835407557' ) d ON a.type = d.f_id
                 LEFT JOIN flow_task e ON a.id = e.f_process_id
         WHERE a.f_delete_mark is null and e.f_status = 2
+          and a.organize_json_id like concat('%',#{organize},'%')
     </select>
 
 

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

@@ -259,6 +259,7 @@
           AND DATE_FORMAT( a.contract_period_time, '%Y-%m-%d' ) <= DATE_FORMAT( NOW( ), '%Y-%m-%d' )
           AND DATE_FORMAT( a.contract_period_time_end, '%Y-%m-%d' ) >= DATE_FORMAT( NOW( ), '%Y-%m-%d' )
           AND a.f_delete_mark IS NULL
+          AND a.organize_json_id like concat('%',#{organize},'%')
           AND g.f_status = 2
     </select>
 
@@ -290,6 +291,7 @@
           AND DATE_FORMAT( a.contract_period_time, '%Y-%m-%d' ) &lt;= DATE_FORMAT( NOW( ), '%Y-%m-%d' )
           AND DATE_FORMAT( a.contract_period_time_end, '%Y-%m-%d' ) &gt;= DATE_FORMAT( NOW( ), '%Y-%m-%d' )
           AND a.f_delete_mark IS NULL
+          AND a.organize_json_id like concat('%',#{organize},'%')
           AND g.f_status = 2
     </select>
 

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

@@ -291,8 +291,10 @@
                 AND d.f_delete_mark IS NULL
                 LEFT JOIN jg_business_line e ON b.business_line_id = e.id
                 AND e.f_delete_mark IS NULL
+                LEFT JOIN flow_task f ON a.id = f.f_process_id
         WHERE
             a.f_delete_mark IS NULL
+          AND f.f_status = 2
           AND a.id = #{id}
     </select>
 

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

@@ -242,9 +242,12 @@
             jg_voucher a
                 LEFT JOIN jg_voucher_vehicle b ON b.voucher_id = a.id AND b.f_delete_mark IS NULL
                 LEFT JOIN jg_voucher_product c ON c.voucher_id = a.id AND c.f_delete_mark IS NULL
+                LEFT JOIN flow_task e ON a.id = e.f_process_id
         WHERE
             a.business_type = '2'
           AND a.document_type = '1'
+          AND e.f_status = 2
+          AND a.organize_json_id like concat('%',#{organize},'%')
     </select>
 
 
@@ -264,9 +267,12 @@
             jg_voucher a
                 LEFT JOIN jg_voucher_vehicle b ON b.voucher_id = a.id AND b.f_delete_mark IS NULL
                 LEFT JOIN jg_voucher_product c ON c.voucher_id = a.id AND c.f_delete_mark IS NULL
+                LEFT JOIN flow_task e ON a.id = e.f_process_id
         WHERE
             a.business_type = '1'
           AND a.document_type = '1'
+          AND e.f_status = 2
+          AND a.organize_json_id like concat('%',#{organize},'%')
     </select>
 
     <select id="queryPurchaseDeliveryVoucher" resultMap="voucherList">
@@ -285,9 +291,12 @@
             jg_voucher a
                 LEFT JOIN jg_voucher_vehicle b ON b.voucher_id = a.id AND b.f_delete_mark IS NULL
                 LEFT JOIN jg_voucher_product c ON c.voucher_id = a.id AND c.f_delete_mark IS NULL
+                LEFT JOIN flow_task e ON a.id = e.f_process_id
         WHERE
             a.business_type = '1'
           AND a.document_type = '2'
+          AND e.f_status = 2
+          AND a.organize_json_id like concat('%',#{organize},'%')
     </select>
 
     <select id="queryVoucherList" resultMap="voucherList">

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

@@ -143,7 +143,7 @@
         FROM
             jg_warehousing_notification a
             LEFT JOIN jg_warehousing_product b ON b.warehousing_id = a.id AND b.f_delete_mark IS NULL
-            WHERE a.business_id = #{id} and a.warehousing_type = #{warehousingType}
+            WHERE a.f_delete_mark IS NULL and a.business_id = #{id} and a.warehousing_type = #{warehousingType}
     </select>
 
     <select id="queryWarehousingNotificationList" resultMap="warehousingNotificationMap">

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

@@ -23,9 +23,9 @@ public interface BusinessLineMapper extends BaseMapper<BusinessLineEntity> {
     IPage<BusinessLineEntity> queryBusinessLineList(@Param("page") Page<BusinessLineEntity> page, @Param("businessLinePagination") BusinessLinePagination businessLinePagination, @Param("ew")QueryWrapper<BusinessLineEntity> businessLineQueryWrapper);
     List<BusinessLineEntity> queryBusinessOrganizeList(@Param("businessLinePagination") BusinessLinePagination businessLinePagination, @Param("ew")QueryWrapper<BusinessLineEntity> businessLineQueryWrapper);
 
-    Integer queryOrganizeCount(String id);
+    Integer queryOrganizeCount(String id,String organize);
-    Integer queryUserCount(String id);
+    Integer queryUserCount(String id,String organize);
 
     //业务组织配置左树
-    List<BusinessLineEntity> queryBusinessOrganizeConfigTree();
+    List<BusinessLineEntity> queryBusinessOrganizeConfigTree(String organize);
 }

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

@@ -25,9 +25,9 @@ import java.util.List;
  */
 public interface BusinessOrderMapper extends BaseMapper<BusinessOrderEntity> {
 
-    List<ContractLEntity> querySaleContract(String businessLineId);
+    List<ContractLEntity> querySaleContract(String businessLineId,String organize);
 
-    List<ContractLEntity> queryPurchaseContract(@Param("businessLineId") String businessLineId);
+    List<ContractLEntity> queryPurchaseContract(@Param("businessLineId") String businessLineId,@Param("organize") String organize);
 
 
     //采购订单查询

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

@@ -28,9 +28,9 @@ public interface VoucherMapper extends BaseMapper<VoucherEntity> {
     IPage<VoucherEntity> queryVoucherPopup(@Param("page") Page<VoucherEntity> page,@Param("ew") QueryWrapper<VoucherEntity> voucherEntityQueryWrapper,@Param("businessType")Object businessType, @Param("documentType")Object documentType);
     IPage<VoucherEntity> queryVoucherPopupByReturn(@Param("page") Page<VoucherEntity> page,@Param("ew") QueryWrapper<VoucherEntity> voucherEntityQueryWrapper,@Param("businessType")Object businessType, @Param("documentType")Object documentType);
     IPage<VoucherEntity> queryVoucherPopupByDelivery(@Param("page") Page<VoucherEntity> page,@Param("ew") QueryWrapper<VoucherEntity> voucherEntityQueryWrapper,@Param("businessType")Object businessType, @Param("documentType")Object documentType);
-    List<VoucherEntity> querySaleReceiptVoucher();
+    List<VoucherEntity> querySaleReceiptVoucher(String organize);
-    List<VoucherEntity> queryPurchaseReceiptVoucher();
+    List<VoucherEntity> queryPurchaseReceiptVoucher(String organize);
-    List<VoucherEntity> queryPurchaseDeliveryVoucher();
+    List<VoucherEntity> queryPurchaseDeliveryVoucher(String organize);
 
     IPage<VoucherEntity> queryVoucherList(@Param("page") Page<VoucherEntity> page, @Param("voucherPagination")VoucherPagination voucherPagination, @Param("ew")QueryWrapper<VoucherEntity> voucherEntityQueryWrapper);
     IPage<VoucherEntity> queryVoucherPopup1(@Param("page") Page<VoucherEntity> page,@Param("ew") QueryWrapper<VoucherEntity> voucherEntityQueryWrapper);

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

@@ -1,7 +1,10 @@
 package jnpf.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import jnpf.entity.*;
 import jnpf.mapper.BusinessLineMapper;
+import jnpf.permission.entity.OrganizeEntity;
+import jnpf.permission.service.OrganizeService;
 import jnpf.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import jnpf.model.businessline.*;
@@ -43,8 +46,10 @@ import javax.annotation.Resource;
  */
 @Service
 public class BusinessLineServiceImpl extends ServiceImpl<BusinessLineMapper, BusinessLineEntity> implements BusinessLineService{
+//    @Autowired
+//    private GeneraterSwapUtil generaterSwapUtil;
     @Autowired
-    private GeneraterSwapUtil generaterSwapUtil;
+    private GeneraterSwapUtil2 generaterSwapUtil;
 
     @Autowired
     private UserProvider userProvider;
@@ -57,6 +62,8 @@ public class BusinessLineServiceImpl extends ServiceImpl<BusinessLineMapper, Bus
     private BusinessCargoService businessCargoService;
     @Resource
     private BusinessLineMapper businessLineMapper;
+    @Autowired
+    private OrganizeService organizeService;
     @Override
     public List<BusinessLineEntity> getList(BusinessLinePagination businessLinePagination){
         return getTypeList(businessLinePagination,businessLinePagination.getDataType());
@@ -672,15 +679,33 @@ public class BusinessLineServiceImpl extends ServiceImpl<BusinessLineMapper, Bus
 
     @Override
     public int queryOrganizeCountInfo(String id) {
-        return businessLineMapper.queryOrganizeCount(id);
+        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.queryOrganizeCount(id,organize);
     }
     @Override
     public int queryUserCountInfo(String id) {
-        return businessLineMapper.queryUserCount(id);
+        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.queryUserCount(id,organize);
     }
 
     @Override
     public List<BusinessLineEntity> queryBusinessOrganizeConfigTree() {
-        return businessLineMapper.queryBusinessOrganizeConfigTree();
+        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.queryBusinessOrganizeConfigTree(organize);
     }
 }

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

@@ -1,11 +1,14 @@
 package jnpf.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.taobao.api.internal.toplink.Pool;
 import jnpf.entity.*;
 import jnpf.mapper.BusinessOrderMapper;
 import jnpf.mapper.BusinessOrderProductRelationalMapper;
 import jnpf.mapper.InventoryMapper;
 import jnpf.mapper.VoucherMapper;
+import jnpf.permission.entity.OrganizeEntity;
+import jnpf.permission.service.OrganizeService;
 import jnpf.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import jnpf.model.businessorder.*;
@@ -66,6 +69,8 @@ public class BusinessOrderServiceImpl extends ServiceImpl<BusinessOrderMapper, B
     private VoucherMapper voucherMapper;
     @Resource
     private InventoryMapper inventoryMapper;
+    @Autowired
+    private OrganizeService organizeService;
     @Override
     public List<BusinessOrderEntity> getList(BusinessOrderPagination businessOrderPagination){
         return getTypeList(businessOrderPagination,businessOrderPagination.getDataType());
@@ -1073,11 +1078,23 @@ public class BusinessOrderServiceImpl extends ServiceImpl<BusinessOrderMapper, B
 
     @Override
     public List<ContractLEntity> querySaleContractInfo(String businessLineId) {
-        return businessOrderMapper.querySaleContract(businessLineId);
+        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 businessOrderMapper.querySaleContract(businessLineId,organize);
     }
 
     @Override
     public List<ContractLEntity> queryPurchaseContractInfo(String businessLineId) {
-        return businessOrderMapper.queryPurchaseContract(businessLineId);
+        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 businessOrderMapper.queryPurchaseContract(businessLineId,organize);
     }
 }

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

@@ -44,7 +44,7 @@ import javax.annotation.Resource;
 @Service
 public class DeliveryOrderServiceImpl extends ServiceImpl<DeliveryOrderMapper, DeliveryOrderEntity> implements DeliveryOrderService{
     @Autowired
-    private GeneraterSwapUtil generaterSwapUtil;
+    private GeneraterSwapUtil2 generaterSwapUtil;
 
     @Autowired
     private UserProvider userProvider;

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

@@ -44,7 +44,7 @@ import javax.annotation.Resource;
 @Service
 public class ReceiptOrderServiceImpl extends ServiceImpl<ReceiptOrderMapper, ReceiptOrderEntity> implements ReceiptOrderService{
     @Autowired
-    private GeneraterSwapUtil generaterSwapUtil;
+    private GeneraterSwapUtil2 generaterSwapUtil;
 
     @Autowired
     private UserProvider userProvider;

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

@@ -45,7 +45,7 @@ import javax.annotation.Resource;
 @Service
 public class ReturnCargoOrderServiceImpl extends ServiceImpl<ReturnCargoOrderMapper, ReturnCargoOrderEntity> implements ReturnCargoOrderService{
     @Autowired
-    private GeneraterSwapUtil generaterSwapUtil;
+    private GeneraterSwapUtil2 generaterSwapUtil;
 
     @Autowired
     private UserProvider userProvider;

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

@@ -1,7 +1,10 @@
 package jnpf.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import jnpf.entity.*;
 import jnpf.mapper.VoucherMapper;
+import jnpf.permission.entity.OrganizeEntity;
+import jnpf.permission.service.OrganizeService;
 import jnpf.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import jnpf.model.voucher.*;
@@ -45,7 +48,7 @@ import javax.annotation.Resource;
 @Service
 public class VoucherServiceImpl extends ServiceImpl<VoucherMapper, VoucherEntity> implements VoucherService{
     @Autowired
-    private GeneraterSwapUtil generaterSwapUtil;
+    private GeneraterSwapUtil2 generaterSwapUtil;
 
     @Autowired
     private UserProvider userProvider;
@@ -54,6 +57,8 @@ public class VoucherServiceImpl extends ServiceImpl<VoucherMapper, VoucherEntity
     private VoucherProductService voucherProductService;
     @Autowired
     private VoucherVehicleService voucherVehicleService;
+    @Autowired
+    private OrganizeService organizeService;
 
     @Resource
     private VoucherMapper voucherMapper;
@@ -243,6 +248,16 @@ public class VoucherServiceImpl extends ServiceImpl<VoucherMapper, VoucherEntity
 
             }
 
+            if(ObjectUtil.isNotEmpty(voucherPagination.getDeliveryType())){
+                voucherNum++;
+
+                String value = voucherPagination.getDeliveryType() instanceof List ?
+                        JsonUtil.getObjectToString(voucherPagination.getDeliveryType()) :
+                        String.valueOf(voucherPagination.getDeliveryType());
+                voucherQueryWrapper.like("a.delivery_type",value);
+
+            }
+
             if(ObjectUtil.isNotEmpty(voucherPagination.getVoucherType())){
             voucherNum++;
 
@@ -566,13 +581,21 @@ public class VoucherServiceImpl extends ServiceImpl<VoucherMapper, VoucherEntity
 
     @Override
     public List<VoucherEntity> queryVoucherPopupInfo(VoucherPagination voucherPagination) {
+        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<VoucherEntity> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("a.business_type",voucherPagination.getBusinessType());
         queryWrapper.eq("a.document_type",voucherPagination.getDocumentType());
-        queryWrapper.eq("voucher_status","4");
+        queryWrapper.eq("a.voucher_status","4");
         queryWrapper.notIn(ObjectUtils.isNotEmpty(voucherPagination.getExcludeIdList()),"a.id",voucherPagination.getExcludeIdList());
         queryWrapper.in(ObjectUtils.isNotEmpty(voucherPagination.getProductIdList()),"c.product_id",voucherPagination.getProductIdList());
         queryWrapper.isNull("a.f_delete_mark");
+        queryWrapper.inSql("a.id", "SELECT f_process_id FROM flow_task WHERE f_status = '2'");//通过审核的订单
+        queryWrapper.like("a.organize_json_id",organize);
         Page<VoucherEntity> page=new Page<>(voucherPagination.getCurrentPage(), voucherPagination.getPageSize());
         IPage<VoucherEntity> voucherEntityIPage = voucherMapper.queryVoucherPopup(page,queryWrapper,voucherPagination.getBusinessType(),voucherPagination.getDocumentType());
         return voucherPagination.setData(voucherEntityIPage.getRecords(),voucherEntityIPage.getTotal());
@@ -580,13 +603,21 @@ public class VoucherServiceImpl extends ServiceImpl<VoucherMapper, VoucherEntity
 
     @Override
     public List<VoucherEntity> queryVoucherPopupByReturnInfo(VoucherPagination voucherPagination) {
+        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<VoucherEntity> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("a.business_type",voucherPagination.getBusinessType());
         queryWrapper.eq("a.document_type",voucherPagination.getDocumentType());
-        queryWrapper.eq("voucher_status","4");
+        queryWrapper.eq("a.voucher_status","4");
         queryWrapper.notIn(ObjectUtils.isNotEmpty(voucherPagination.getExcludeIdList()),"a.id",voucherPagination.getExcludeIdList());
         queryWrapper.in(ObjectUtils.isNotEmpty(voucherPagination.getProductIdList()),"c.product_id",voucherPagination.getProductIdList());
         queryWrapper.isNull("a.f_delete_mark");
+        queryWrapper.inSql("a.id", "SELECT f_process_id FROM flow_task WHERE f_status = '2'");//通过审核的订单
+        queryWrapper.like("a.organize_json_id",organize);
         Page<VoucherEntity> page=new Page<>(voucherPagination.getCurrentPage(), voucherPagination.getPageSize());
         IPage<VoucherEntity> voucherEntityIPage = voucherMapper.queryVoucherPopupByReturn(page,queryWrapper,voucherPagination.getBusinessType(),voucherPagination.getDocumentType());
         return voucherPagination.setData(voucherEntityIPage.getRecords(),voucherEntityIPage.getTotal());
@@ -594,13 +625,21 @@ public class VoucherServiceImpl extends ServiceImpl<VoucherMapper, VoucherEntity
 
     @Override
     public List<VoucherEntity> queryVoucherPopupByDeliveryInfo(VoucherPagination voucherPagination) {
+        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<VoucherEntity> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("a.business_type",voucherPagination.getBusinessType());
         queryWrapper.eq("a.document_type",voucherPagination.getDocumentType());
-        queryWrapper.eq("voucher_status","4");
+        queryWrapper.eq("a.voucher_status","4");
         queryWrapper.notIn(ObjectUtils.isNotEmpty(voucherPagination.getExcludeIdList()),"a.id",voucherPagination.getExcludeIdList());
         queryWrapper.in(ObjectUtils.isNotEmpty(voucherPagination.getProductIdList()),"c.product_id",voucherPagination.getProductIdList());
         queryWrapper.isNull("a.f_delete_mark");
+        queryWrapper.inSql("a.id", "SELECT f_process_id FROM flow_task WHERE f_status = '2'");//通过审核的订单
+        queryWrapper.like("a.organize_json_id",organize);
         Page<VoucherEntity> page=new Page<>(voucherPagination.getCurrentPage(), voucherPagination.getPageSize());
         IPage<VoucherEntity> voucherEntityIPage = voucherMapper.queryVoucherPopupByDelivery(page,queryWrapper,voucherPagination.getBusinessType(),voucherPagination.getDocumentType());
         return voucherPagination.setData(voucherEntityIPage.getRecords(),voucherEntityIPage.getTotal());
@@ -608,6 +647,12 @@ public class VoucherServiceImpl extends ServiceImpl<VoucherMapper, VoucherEntity
 
     @Override
     public List<VoucherEntity> queryInspectionVoucherPopupInfo(VoucherPagination voucherPagination) {
+        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<VoucherEntity> queryWrapper = new QueryWrapper<>();
 //        queryWrapper.eq("a.business_type",voucherPagination.getBusinessType());
         queryWrapper.eq("a.document_type",voucherPagination.getDocumentType());
@@ -615,6 +660,8 @@ public class VoucherServiceImpl extends ServiceImpl<VoucherMapper, VoucherEntity
         queryWrapper.notIn(ObjectUtils.isNotEmpty(voucherPagination.getExcludeIdList()),"a.id",voucherPagination.getExcludeIdList());
         queryWrapper.in(ObjectUtils.isNotEmpty(voucherPagination.getProductIdList()),"c.product_id",voucherPagination.getProductIdList());
         queryWrapper.isNull("a.f_delete_mark");
+        queryWrapper.inSql("a.id", "SELECT f_process_id FROM flow_task WHERE f_status = '2'");//通过审核的订单
+        queryWrapper.like("a.organize_json_id",organize);
         Page<VoucherEntity> page=new Page<>(voucherPagination.getCurrentPage(), voucherPagination.getPageSize());
         IPage<VoucherEntity> voucherEntityIPage = voucherMapper.queryVoucherPopup1(page,queryWrapper);
         return voucherPagination.setData(voucherEntityIPage.getRecords(),voucherEntityIPage.getTotal());
@@ -622,12 +669,20 @@ public class VoucherServiceImpl extends ServiceImpl<VoucherMapper, VoucherEntity
 
     @Override
     public List<VoucherEntity> queryNotificationVoucherPopupInfo(VoucherPagination voucherPagination) {
+        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<VoucherEntity> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("b.product_id",voucherPagination.getProductId());
         queryWrapper.eq("a.voucher_status","4");
         queryWrapper.notIn(ObjectUtils.isNotEmpty(voucherPagination.getExcludeIdList()),"a.id",voucherPagination.getExcludeIdList());
         queryWrapper.in(ObjectUtils.isNotEmpty(voucherPagination.getProductIdList()),"b.product_id",voucherPagination.getProductIdList());
         queryWrapper.isNull("a.f_delete_mark");
+        queryWrapper.inSql("a.id", "SELECT f_process_id FROM flow_task WHERE f_status = '2'");//通过审核的订单
+        queryWrapper.like("a.organize_json_id",organize);
         Page<VoucherEntity> page=new Page<>(voucherPagination.getCurrentPage(), voucherPagination.getPageSize());
         IPage<VoucherEntity> voucherEntityIPage = voucherMapper.queryVoucherNotification(page,queryWrapper);
         return voucherPagination.setData(voucherEntityIPage.getRecords(),voucherEntityIPage.getTotal());
@@ -636,17 +691,35 @@ public class VoucherServiceImpl extends ServiceImpl<VoucherMapper, VoucherEntity
 
     @Override
     public List<VoucherEntity> querySaleReceiptVoucherInfo() {
-        return voucherMapper.querySaleReceiptVoucher();
+        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 voucherMapper.querySaleReceiptVoucher(organize);
     }
 
     @Override
     public List<VoucherEntity> queryPurchaseReceiptVoucherInfo() {
-        return voucherMapper.queryPurchaseReceiptVoucher();
+        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 voucherMapper.queryPurchaseReceiptVoucher(organize);
     }
 
     @Override
     public List<VoucherEntity> queryPurchaseDeliveryVoucherInfo() {
-        return voucherMapper.queryPurchaseDeliveryVoucher();
+        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 voucherMapper.queryPurchaseDeliveryVoucher(organize);
     }
 
     @Override

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

@@ -565,9 +565,9 @@ public class BusinessOrderController {
                         if (StringUtils.isNotEmpty(entity.getBusinessType()) && entity.getBusinessType().equals("1")) {
                             entity.setStatus("3");//采购单审核通过后状态改为待入库
                         }else if(StringUtils.isNotEmpty(entity.getBusinessType()) && entity.getBusinessType().equals("2") && entity.getDeliveryType().equals("1")){
-                            entity.setStatus("3");
+                            entity.setStatus("3");//销售单仓配审核通过后状态改为待锁定
                         }else if(StringUtils.isNotEmpty(entity.getBusinessType()) && entity.getBusinessType().equals("2") && entity.getDeliveryType().equals("2")){
-                            entity.setStatus("4");
+                            entity.setStatus("4");//销售单直送审核通过后状态改为待出库
                         }
                         businessOrderService.saveOrUpdate(entity);
                     }
@@ -675,6 +675,12 @@ public class BusinessOrderController {
     @Operation(summary = "销售发货单中的销售订单列表")
     @GetMapping("/getSalesOrderList")
     public ActionResult list()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("]","");
         QueryWrapper<BusinessOrderEntity> businessOrderQueryWrapper=new QueryWrapper<>();
         businessOrderQueryWrapper.eq("a.business_type", "2");//销售
         businessOrderQueryWrapper.eq("a.delivery_type","2");//配送方式为直送
@@ -683,6 +689,7 @@ public class BusinessOrderController {
         );
         businessOrderQueryWrapper.isNull("a.f_delete_mark");
         businessOrderQueryWrapper.inSql("a.id", "SELECT f_process_id FROM flow_task WHERE f_status = '2'");//通过审核的订单
+        businessOrderQueryWrapper.like("a.organize_json_id",organize);
         List<BusinessOrderEntity> businessOrderEntityList = businessOrderService.saleOrderByDeliveryOrderInfo(businessOrderQueryWrapper);
 //        List<Map<String, Object>> realList=new ArrayList<>();
         for (BusinessOrderEntity entity: businessOrderEntityList) {
@@ -775,6 +782,10 @@ public class BusinessOrderController {
     public ActionResult list1()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("]","");
         QueryWrapper<BusinessOrderEntity> businessOrderQueryWrapper=new QueryWrapper<>();
         businessOrderQueryWrapper.eq("a.business_type", "1");//采购
         businessOrderQueryWrapper.eq("a.delivery_type","2");//配送方式为直送
@@ -783,7 +794,7 @@ public class BusinessOrderController {
         );
         businessOrderQueryWrapper.isNull("a.f_delete_mark");
         businessOrderQueryWrapper.inSql("a.id", "SELECT f_process_id FROM flow_task WHERE f_status = '2'");//通过审核的订单
-        businessOrderQueryWrapper.eq("a.organize_json_id",organizeEntity.getOrganizeIdTree());
+        businessOrderQueryWrapper.like("a.organize_json_id",organize);
         List<BusinessOrderEntity> businessOrderEntityList = businessOrderService.purchaseOrderByReceiptOrderInfo(businessOrderQueryWrapper);
 //        List<Map<String, Object>> realList=new ArrayList<>();
         for (BusinessOrderEntity entity: businessOrderEntityList) {
@@ -812,6 +823,10 @@ public class BusinessOrderController {
     public ActionResult returnPurchaseOrder()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("]","");
         QueryWrapper<BusinessOrderEntity> businessOrderQueryWrapper=new QueryWrapper<>();
         businessOrderQueryWrapper.eq("a.business_type", "1");//采购
         businessOrderQueryWrapper.and(wrapper ->
@@ -819,7 +834,7 @@ public class BusinessOrderController {
         );
         businessOrderQueryWrapper.isNull("a.f_delete_mark");
         businessOrderQueryWrapper.inSql("a.id", "SELECT f_process_id FROM flow_task WHERE f_status = '2'");//通过审核的订单
-        businessOrderQueryWrapper.eq("a.organize_json_id",organizeEntity.getOrganizeIdTree());
+        businessOrderQueryWrapper.like("a.organize_json_id",organize);
         List<BusinessOrderEntity> businessOrderEntityList = businessOrderService.purchaseOrderByReceiptOrderInfo(businessOrderQueryWrapper);
         for (BusinessOrderEntity entity: businessOrderEntityList) {
             //副表数据
@@ -996,7 +1011,7 @@ public class BusinessOrderController {
     @Operation(summary = "获取销售合同列表")
     @GetMapping("/getSaleContractList")
     public ActionResult list2(@RequestParam("businessLineId") String businessLineId)throws IOException{
-              List<ContractLEntity> list= businessOrderService.querySaleContractInfo(businessLineId);
+        List<ContractLEntity> list= businessOrderService.querySaleContractInfo(businessLineId);
         for (ContractLEntity entity : list){
             List<ProductByContractModel> productByContractModelList =  businessOrderService.queryProductByContractInfo(entity.getId());
             entity.setProductByContractModelList(productByContractModelList);
@@ -1100,13 +1115,10 @@ public class BusinessOrderController {
     @Operation(summary = "采购收货凭证生成采购收货单")
     @GetMapping("/createReceiptOrderByVoucher")
     public ActionResult createReceiptOrderByVoucher(@RequestParam("businessOrderId") String businessOrderId)throws IOException{
-        UserInfo userInfo=userProvider.get();
-        OrganizeEntity organizeEntity =  organizeService.getInfo(userInfo.getOrganizeId());
         QueryWrapper<BusinessOrderEntity> businessOrderQueryWrapper=new QueryWrapper<>();
         businessOrderQueryWrapper.eq("a.id",businessOrderId);
         businessOrderQueryWrapper.isNull("a.f_delete_mark");
         businessOrderQueryWrapper.inSql("a.id", "SELECT f_process_id FROM flow_task WHERE f_status = '2'");//通过审核的订单
-        businessOrderQueryWrapper.eq("a.organize_json_id",organizeEntity.getOrganizeIdTree()); //权限
         List<BusinessOrderEntity> businessOrderEntityList = businessOrderService.purchaseOrderByReceiptOrderInfo(businessOrderQueryWrapper);
         if (businessOrderEntityList == null){
             return ActionResult.fail("采购订单未审核");

jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/ReturnCargoOrderController.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;
@@ -10,7 +11,9 @@ import jnpf.engine.entity.FlowTaskNodeEntity;
 import jnpf.engine.service.FlowTaskNodeService;
 import jnpf.engine.service.FlowTaskService;
 import jnpf.exception.DataException;
+import jnpf.permission.entity.OrganizeEntity;
 import jnpf.permission.entity.UserEntity;
+import jnpf.permission.service.OrganizeService;
 import jnpf.service.*;
 import jnpf.entity.*;
 import jnpf.util.*;
@@ -96,6 +99,8 @@ public class ReturnCargoOrderController {
     private BusinessLineService businessLineService;
     @Autowired
     private WarehousingNotificationService warehousingNotificationService;
+    @Autowired
+    private OrganizeService organizeService;
 
     /**
     * 列表
@@ -587,6 +592,12 @@ public class ReturnCargoOrderController {
     @Operation(summary = "获取销售退货列表")
     @GetMapping("/getSaleReturnCargoList")
     public ActionResult list()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("]","");
         QueryWrapper<ReturnCargoOrderEntity> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("a.document_type","2");
         queryWrapper.and(wrapper ->
@@ -595,6 +606,7 @@ public class ReturnCargoOrderController {
         queryWrapper.eq("b.delivery_type","2");
         queryWrapper.isNull("a.f_delete_mark");
         queryWrapper.inSql("a.id", "SELECT f_process_id FROM flow_task WHERE f_status = '2'");//通过审核的订单
+        queryWrapper.like("a.organize_json_id",organize);
         List<ReturnCargoOrderEntity> list= returnCargoOrderService.queryReturnOrderByDeliveryInfo(queryWrapper);
 //        List<Map<String, Object>> realList=new ArrayList<>();
         for (ReturnCargoOrderEntity entity : list) {
@@ -651,6 +663,12 @@ public class ReturnCargoOrderController {
     @Operation(summary = "获取采购发货中退货单列表")
     @GetMapping("/getPurchaseReturnCargoList")
     public ActionResult list1()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("]","");
         QueryWrapper<ReturnCargoOrderEntity> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("a.document_type","1");
         queryWrapper.and(wrapper ->
@@ -659,46 +677,16 @@ public class ReturnCargoOrderController {
         queryWrapper.eq("b.delivery_type","2");
         queryWrapper.isNull("a.f_delete_mark");
         queryWrapper.inSql("a.id", "SELECT f_process_id FROM flow_task WHERE f_status = '2'");//通过审核的订单
+        queryWrapper.like("a.organize_json_id",organize);
         List<ReturnCargoOrderEntity> list= returnCargoOrderService.queryReturnOrderByDeliveryInfo(queryWrapper);
-//        List<Map<String, Object>> realList=new ArrayList<>();
         for (ReturnCargoOrderEntity entity : list) {
-//            if (StringUtil.isNotEmpty(entity.getBusinessId())){
-//                //查询采购订单数据带入退货订单
-//                BusinessOrderEntity businessOrderEntity = businessOrderService.getInfo(entity.getBusinessId());
-//                if (businessOrderEntity != null) {
-//                    entity.setExpectReturnCargoTimeStart(businessOrderEntity.getExpectArriveDateStart());
-//                    entity.setExpectReturnCargoTimeEnd(businessOrderEntity.getExpectArriveDateEnd());
-//                    entity.setBusinessOrderType(businessOrderEntity.getBusinessOrderType());
-//                    entity.setCurrency(businessOrderEntity.getCurrency());
-//                    entity.setSaleMode(businessOrderEntity.getSaleMode());
-//                    entity.setTransactionMode(businessOrderEntity.getTransactionMode());
-//                    entity.setDeliveryType(businessOrderEntity.getDeliveryType());
-//                    entity.setTransportMode(businessOrderEntity.getTransportMode());
-//                    entity.setCarriageMode(businessOrderEntity.getCarriageMode());
-//                    entity.setCarrier(businessOrderEntity.getCarrier());
-//                    entity.setBusinessLineId(businessOrderEntity.getBusinessLineId());
-//                }
-//            }
-            //副表数据
             //子表数据
             List<DeliveryVoucherRelationEntity> deliveryVoucherRelationList = returnCargoOrderService.getDeliveryVoucherRelationList(entity.getId());
-//            returnCargoOrderMap.put("tableField128",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(deliveryVoucherRelationList)));
             List<DeliveryProductRelationEntity> deliveryProductRelationList = returnCargoOrderService.getDeliveryProductRelationList(entity.getId());
-//            returnCargoOrderMap.put("tableField144",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(deliveryProductRelationList)));
-//            realList.add(returnCargoOrderMap);
             entity.setDeliveryVoucherRelationEntityList(deliveryVoucherRelationList);
             entity.setDeliveryProductRelationEntityList(deliveryProductRelationList);
 
         }
-        //数据转换
-//        realList = generaterSwapUtil.swapDataList(realList, ReturnCargoOrderConstant.getFormData(), ReturnCargoOrderConstant.getColumnData(), returnCargoOrderPagination.getModuleId(),false);
-
-        //返回对象
-//        PageListVO vo = new PageListVO();
-//        vo.setList(list);
-//        PaginationVO page = JsonUtil.getJsonToBean(returnCargoOrderPagination, PaginationVO.class);
-//        vo.setPagination(page);
-//        return ActionResult.success(vo);
         return ActionResult.success(list);
     }
 
@@ -715,6 +703,7 @@ public class ReturnCargoOrderController {
         QueryWrapper<DeliveryProductRelationEntity> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(DeliveryProductRelationEntity::getBusinessType,'2');
         queryWrapper.lambda().eq(DeliveryProductRelationEntity::getOrderId,id);
+        queryWrapper.lambda().isNull(DeliveryProductRelationEntity::getDeleteMark);
         List<DeliveryProductRelationEntity> deliveryProductRelationEntityList = deliveryProductRelationService.list(queryWrapper);
         //查询已经生成的采购退货出库通知
         List<WarehousingProductEntity> list = warehousingNotificationService.queryInBoundNoticeInfo(returnCargoOrderEntity.getId(),"7");
@@ -757,6 +746,7 @@ public class ReturnCargoOrderController {
         QueryWrapper<DeliveryProductRelationEntity> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(DeliveryProductRelationEntity::getBusinessType,'5');
         queryWrapper.lambda().eq(DeliveryProductRelationEntity::getOrderId,id);
+        queryWrapper.lambda().isNull(DeliveryProductRelationEntity::getDeleteMark);
         List<DeliveryProductRelationEntity> deliveryProductRelationEntityList = deliveryProductRelationService.list(queryWrapper);
         //查询已经生成的销售退货入库通知
         List<WarehousingProductEntity> list = warehousingNotificationService.queryInBoundNoticeInfo(returnCargoOrderEntity.getId(),"2");

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

@@ -528,7 +528,11 @@ public class VoucherController {
                     flowTaskNodeEntityQueryWrapper.lambda().eq(FlowTaskNodeEntity::getTaskId, flowTaskEntity.getId());
                     List<FlowTaskNodeEntity> flowTaskNodeEntityList = flowTaskNodeService.list(flowTaskNodeEntityQueryWrapper);
                     if(flowTaskNodeEntityList != null && flowTaskNodeEntityList.size()>0 && "end".equals(flowTaskNodeEntityList.get(0).getNodeNext())) {
-                        entity.setVoucherStatus("3");
+                        if (StringUtils.isNotEmpty(entity.getDeliveryType()) && entity.getDeliveryType().equals("1")) {
+                            entity.setVoucherStatus("3");
+                        }else if(StringUtils.isNotEmpty(entity.getDeliveryType()) && entity.getDeliveryType().equals("2")){
+                            entity.setVoucherStatus("4");
+                        }
                         voucherService.saveOrUpdate(entity);
                     }
                 }
@@ -678,6 +682,7 @@ public class VoucherController {
             queryWrapper.lambda().and(wrapper ->
                     wrapper.eq(WarehousingNotificationEntity::getWarehousingStatus,"3").or().eq(WarehousingNotificationEntity::getWarehousingStatus,"4"));
             queryWrapper.inSql("id", "SELECT f_process_id FROM flow_task WHERE f_status = '2'");//通过审核的订单
+            queryWrapper.lambda().isNull(WarehousingNotificationEntity::getDeleteMark);
             //找出入库通知
             List<WarehousingNotificationEntity> noticeList = warehousingNotificationService.list(queryWrapper);
             for (WarehousingNotificationEntity entity : noticeList){
@@ -686,6 +691,7 @@ public class VoucherController {
                 storageQueryWrapper.lambda().eq(WarehousingStorageEntity::getWarehousingStorageType,"1");//采购入库
                 storageQueryWrapper.lambda().eq(WarehousingStorageEntity::getWarehousingStorageStatus,"3");//状态为已入库
                 storageQueryWrapper.inSql("id", "SELECT f_process_id FROM flow_task WHERE f_status = '2'");//通过审核的订单
+                storageQueryWrapper.lambda().isNull(WarehousingStorageEntity::getDeleteMark);
                 //找出入库单
                 List<WarehousingStorageEntity> warehousingStorageEntityList =  warehousingStorageService.list(storageQueryWrapper);
                 for (WarehousingStorageEntity storageEntity : warehousingStorageEntityList){
@@ -702,6 +708,7 @@ public class VoucherController {
             receiptOrderQueryWrapper.lambda().eq(ReceiptOrderEntity::getReceiptType,"1");
             receiptOrderQueryWrapper.lambda().eq(ReceiptOrderEntity::getReceiptStatus,"3");
             receiptOrderQueryWrapper.inSql("id", "SELECT f_process_id FROM flow_task WHERE f_status = '2'");//通过审核的订单
+            receiptOrderQueryWrapper.lambda().isNull(ReceiptOrderEntity::getDeleteMark);
             List<ReceiptOrderEntity>  receiptOrderEntityList = receiptOrderService.list(receiptOrderQueryWrapper);
             //循环收货单找出所有的入库单
             for (ReceiptOrderEntity receiptOrderEntity : receiptOrderEntityList){
@@ -709,6 +716,8 @@ public class VoucherController {
                 storageQueryWrapper.lambda().eq(WarehousingStorageEntity::getWarehousingId,receiptOrderEntity.getId());
                 storageQueryWrapper.lambda().eq(WarehousingStorageEntity::getWarehousingStorageType,"15");//采购收货单入库
                 storageQueryWrapper.lambda().eq(WarehousingStorageEntity::getWarehousingStorageStatus,"3");//状态为已入库
+                storageQueryWrapper.lambda().isNull(WarehousingStorageEntity::getDeleteMark);
+                storageQueryWrapper.inSql("id", "SELECT f_process_id FROM flow_task WHERE f_status = '2'");//通过审核的订单
                 //找出入库单
                 List<WarehousingStorageEntity> warehousingStorageEntityList =  warehousingStorageService.list(storageQueryWrapper);
                 for (WarehousingStorageEntity warehousingStorageEntity : warehousingStorageEntityList){
@@ -767,6 +776,7 @@ public class VoucherController {
             queryWrapper.lambda().and(wrapper ->
                     wrapper.eq(WarehousingNotificationEntity::getWarehousingStatus,"3").or().eq(WarehousingNotificationEntity::getWarehousingStatus,"4"));
             queryWrapper.inSql("id", "SELECT f_process_id FROM flow_task WHERE f_status = '2'");//通过审核的订单
+            queryWrapper.lambda().isNull(WarehousingNotificationEntity::getDeleteMark);
             //找出出库通知
             List<WarehousingNotificationEntity> noticeList = warehousingNotificationService.list(queryWrapper);
             for (WarehousingNotificationEntity entity : noticeList){
@@ -775,6 +785,7 @@ public class VoucherController {
                 storageQueryWrapper.lambda().eq(WarehousingOutboundEntity::getWarehousingOutboundType,"1");//销售出库
                 storageQueryWrapper.lambda().eq(WarehousingOutboundEntity::getWarehousingOutboundStatus,"3");//状态为已入库
                 storageQueryWrapper.inSql("id", "SELECT f_process_id FROM flow_task WHERE f_status = '2'");//通过审核的订单
+                storageQueryWrapper.lambda().isNull(WarehousingOutboundEntity::getDeleteMark);
                 //找出出库单
                 List<WarehousingOutboundEntity> warehousingOutboundEntityList =  warehousingOutboundService.list(storageQueryWrapper);
                 for (WarehousingOutboundEntity storageEntity : warehousingOutboundEntityList){
@@ -791,6 +802,7 @@ public class VoucherController {
             deliveryOrderEntityQueryWrapper.lambda().eq(DeliveryOrderEntity::getDeliveryType,"2");
             deliveryOrderEntityQueryWrapper.lambda().eq(DeliveryOrderEntity::getDeliveryStatus,"3");
             deliveryOrderEntityQueryWrapper.inSql("id", "SELECT f_process_id FROM flow_task WHERE f_status = '2'");//通过审核的订单
+            deliveryOrderEntityQueryWrapper.lambda().isNull(DeliveryOrderEntity::getDeleteMark);
             List<DeliveryOrderEntity>  deliveryOrderEntityList = deliveryOrderService.list(deliveryOrderEntityQueryWrapper);
             //循环发货单找出所有的出库单
             for (DeliveryOrderEntity deliveryOrderEntity : deliveryOrderEntityList){
@@ -798,6 +810,8 @@ public class VoucherController {
                 outboundQueryWrapper.lambda().eq(WarehousingOutboundEntity::getWarehousingId,deliveryOrderEntity.getId());
                 outboundQueryWrapper.lambda().eq(WarehousingOutboundEntity::getWarehousingOutboundType,"12");//销售发货单出库
                 outboundQueryWrapper.lambda().eq(WarehousingOutboundEntity::getWarehousingOutboundStatus,"3");//状态为已出库
+                outboundQueryWrapper.inSql("id", "SELECT f_process_id FROM flow_task WHERE f_status = '2'");//通过审核的订单
+                outboundQueryWrapper.lambda().isNull(WarehousingOutboundEntity::getDeleteMark);
                 //找出入库单
                 List<WarehousingOutboundEntity> warehousingOutboundEntityList =  warehousingOutboundService.list(outboundQueryWrapper);
                 for (WarehousingOutboundEntity warehousingOutboundEntity : warehousingOutboundEntityList){
@@ -926,6 +940,7 @@ public class VoucherController {
             if (StringUtil.isNotEmpty(entity.getProductId())){
                 QueryWrapper<ProductWarehouseEntity> queryWrapper = new QueryWrapper<>();
                 queryWrapper.lambda().eq(ProductWarehouseEntity::getId,entity.getProductId());
+                queryWrapper.lambda().isNull(ProductWarehouseEntity::getDeleteMark);
                 List<ProductWarehouseEntity> productWarehouseEntity = productWarehouseService.list(queryWrapper);
                 for (ProductWarehouseEntity productEntity : productWarehouseEntity) {
                     productEntity.setUnit(entity.getUnit());
@@ -955,7 +970,7 @@ public class VoucherController {
             if (StringUtil.isNotEmpty(entity.getProductId())){
                 QueryWrapper<ProductWarehouseEntity> queryWrapper = new QueryWrapper<>();
                 queryWrapper.lambda().eq(ProductWarehouseEntity::getId,entity.getProductId());
-                queryWrapper.isNull("f_delete_mark");
+                queryWrapper.lambda().isNull(ProductWarehouseEntity::getDeleteMark);
                 List<ProductWarehouseEntity> productWarehouseEntity = productWarehouseService.list(queryWrapper);
                 for (ProductWarehouseEntity productEntity : productWarehouseEntity) {
                     productEntity.setUnit(entity.getUnit());
@@ -985,7 +1000,7 @@ public class VoucherController {
             if (StringUtil.isNotEmpty(entity.getProductId())){
                 QueryWrapper<ProductWarehouseEntity> queryWrapper = new QueryWrapper<>();
                 queryWrapper.lambda().eq(ProductWarehouseEntity::getId,entity.getProductId());
-                queryWrapper.isNull("f_delete_mark");
+                queryWrapper.lambda().isNull(ProductWarehouseEntity::getDeleteMark);
                 List<ProductWarehouseEntity> productWarehouseEntity = productWarehouseService.list(queryWrapper);
                 for (ProductWarehouseEntity productEntity : productWarehouseEntity) {
                     productEntity.setUnit(entity.getUnit());

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/VoucherEntity.java

@@ -141,6 +141,8 @@ public class VoucherEntity  {
     private String isSaleDeliveryVoucher;
     @TableField("IS_RETURN_CARGO_ORDER")
     private String isReturnCargoOrder;
+    @TableField("DELIVERY_TYPE")
+    private String deliveryType;
 
 
     @TableField(exist = false)

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/voucher/VoucherForm.java

@@ -35,6 +35,9 @@ public class VoucherForm  {
     /** 凭证类型 **/
     @JsonProperty("voucherType")
     private Object voucherType;
+    /** 配送方式 **/
+    @JsonProperty("deliveryType")
+    private Object deliveryType;
     /** 制单时间 **/
     @JsonProperty("preparationTime")
     private String preparationTime;

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/voucher/VoucherPagination.java

@@ -36,6 +36,9 @@ public class VoucherPagination extends Pagination {
     /** 凭证类型 */
     @JsonProperty("voucherType")
     private Object voucherType;
+    /** 配送方式 */
+    @JsonProperty("deliveryType")
+    private Object deliveryType;
     /** 制单时间 */
     @JsonProperty("preparationTime")
     private Object preparationTime;

jnpf-java-boot/jnpf-web/src/views/scm/businessLine/index.vue

@@ -191,6 +191,7 @@ export default {
   },
   data() {
     return {
+      businessLineIdProp: '',
       keyword: '',
       expandsTree: true,
       refreshTree: true,

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

@@ -123,7 +123,7 @@ export default {
           this.total = res.data.pagination.total
         })
       } else if (this.type == '2') {
-        //退货订单获取凭证列表和关联的商品
+        //采购退货订单获取凭证列表和关联的商品
         request({
           url: `/api/scm/Voucher/returnOrderGetVoucherList`,
           method: 'post',

jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/deliveryVoucher/form.vue

@@ -54,6 +54,15 @@
               </JnpfPopupSelect>
             </jnpf-form-tip-item>
           </el-col>
+          <el-col :span="8" v-if="judgeShow('voucherType')">
+            <jnpf-form-tip-item label="配送方式" v-if="judgeShow('voucherType')" prop="deliveryType">
+              <JnpfSelect v-model="dataForm.deliveryType" @change="changeData('voucherType', -1)"
+                placeholder="请选择" :disabled="judgeWrite('voucherType')" clearable
+                :style='{ "width": "100%" }' :options="deliveryTypeOptions"
+                :props="deliveryTypeProps">
+              </JnpfSelect>
+            </jnpf-form-tip-item>
+          </el-col>
           <el-col :span="24">
             <div style="padding:15px 0px">
               <span style="color: #409EFF;">▋</span>
@@ -670,6 +679,7 @@ export default {
       dataForm: {
         voucherCode: undefined,
         voucherType: '1',
+        deliveryType: undefined,
         preparationTime: new Date(),
         associateThirdSuppliers: undefined,
         voucherPictures: [],
@@ -714,6 +724,13 @@ export default {
             trigger: 'change'
           },
         ],
+        deliveryType: [
+          {
+            required: true,
+            message: '请选择',
+            trigger: 'change'
+          },
+        ],
         preparationTime: [
           {
             required: true,
@@ -820,9 +837,11 @@ export default {
           },
         ],
       },
+      deliveryTypeOptions: [{ "fullName": "仓配", "id": "1" }, { "fullName": "直送", "id": "2" }],
+      deliveryTypeProps: { "label": "fullName", "value": "id" },
       voucherTypeOptions: [{ "fullName": "磅单", "id": "1" }, { "fullName": "收据", "id": "2" }, { "fullName": "其他", "id": "3" }],
       voucherTypeProps: { "label": "fullName", "value": "id" },
-      associateThirdSupplierscolumnOptions: [{ "label": "供应商编码", "value": "code" }, { "label": "供应商名称", "value": "name" },],
+      associateThirdSupplierscolumnOptions: [{ "label": "供应商名称", "value": "name" }, { "label": "国家", "value": "country" }, { "label": "地址", "value": "address" }, { "label": "电话", "value": "phone" }],
       modeTransportOptions: [{ "fullName": "公路", "id": "1" }, { "fullName": "铁路", "id": "2" }, { "fullName": "轮船", "id": "3" }, { "fullName": "空运", "id": "4" }, { "fullName": "无", "id": "5" }],
       modeTransportProps: { "label": "fullName", "value": "id" },
       transportationMethodOptions: [{ "fullName": "仓库承运(DC)", "id": "1" }, { "fullName": "承运商", "id": "2" }, { "fullName": "供应商", "id": "3" }, { "fullName": "自提", "id": "4" }],
@@ -842,6 +861,7 @@ export default {
       interfaceRes: {
         voucherCode: [],
         voucherType: [],
+        deliveryType: [],
         preparationTime: [],
         associateThirdSuppliers: [],
         voucherPictures: [],

jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOutBoundNotice/form.vue

@@ -250,11 +250,11 @@
               prop="subjectBasicId">
               <JnpfPopupSelect v-model="dataForm.subjectBasicId"
                 @change="changeData('subjectBasicId',-1)" :rowIndex="null" :formData="dataForm"
-                :templateJson="interfaceRes.subjectBasicId" placeholder="请选择"
+                :templateJson="interfaceRes.subjectBasicId" placeholder="请选择" :disabled="true"
-                :disabled="judgeWrite('subjectBasicId')" propsValue="id" popupWidth="800px"
+                propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
-                popupTitle="选择数据" popupType="dialog" relationField='name' field='subjectBasicId'
+                relationField='name' field='subjectBasicId' interfaceId="530001731111617029"
-                interfaceId="530001731111617029" :pageSize="20"
+                :pageSize="20" :columnOptions="subjectBasicIdcolumnOptions" clearable
-                :columnOptions="subjectBasicIdcolumnOptions" clearable :style='{"width":"100%"}'>
+                :style='{"width":"100%"}'>
               </JnpfPopupSelect>
             </jnpf-form-tip-item>
           </el-col>
@@ -262,8 +262,8 @@
             <jnpf-form-tip-item label="收货地址" v-if="judgeShow('shippingAddress')"
               prop="shippingAddress">
               <JnpfInput v-model="dataForm.deliveryAddress"
-                @change="changeData('shippingAddress',-1)" placeholder="请输入"
+                @change="changeData('shippingAddress',-1)" placeholder="请输入" :disabled="true"
-                :disabled="judgeWrite('shippingAddress')" clearable :style='{"width":"100%"}'>
+                clearable :style='{"width":"100%"}'>
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
@@ -277,11 +277,11 @@
             <jnpf-form-tip-item label="机构名称" v-if="judgeShow('enterpriseId')" prop="enterpriseId">
               <JnpfPopupSelect v-model="dataForm.enterpriseId"
                 @change="changeData('enterpriseId',-1)" :rowIndex="null" :formData="dataForm"
-                :templateJson="interfaceRes.enterpriseId" placeholder="请选择"
+                :templateJson="interfaceRes.enterpriseId" placeholder="请选择" :disabled="true"
-                :disabled="judgeWrite('enterpriseId')" propsValue="f_id" popupWidth="800px"
+                propsValue="f_id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
-                popupTitle="选择数据" popupType="dialog" relationField='f_full_name'
+                relationField='f_full_name' field='enterpriseId' interfaceId="522729853024209157"
-                field='enterpriseId' interfaceId="522729853024209157" :pageSize="20"
+                :pageSize="20" :columnOptions="enterpriseIdcolumnOptions" clearable
-                :columnOptions="enterpriseIdcolumnOptions" clearable :style='{"width":"100%"}'>
+                :style='{"width":"100%"}'>
               </JnpfPopupSelect>
             </jnpf-form-tip-item>
           </el-col>
@@ -289,9 +289,9 @@
             <jnpf-form-tip-item label="发货仓库" v-if="judgeShow('warehouseId')" prop="warehouseId">
               <JnpfPopupSelect v-model="dataForm.warehouseId" @change="changeData('warehouseId',-1)"
                 :rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.warehouseId"
-                placeholder="请选择" :disabled="judgeWrite('warehouseId')" propsValue="id"
+                placeholder="请选择" :disabled="true" propsValue="id" popupWidth="800px"
-                popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='name'
+                popupTitle="选择数据" popupType="dialog" relationField='name' field='warehouseId'
-                field='warehouseId' interfaceId="529573170819104773" :pageSize="20"
+                interfaceId="529573170819104773" :pageSize="20"
                 :columnOptions="warehouseIdcolumnOptions" clearable :style='{"width":"100%"}'>
               </JnpfPopupSelect>
             </jnpf-form-tip-item>
@@ -301,10 +301,10 @@
               prop="deliveryAddress">
               <JnpfPopupSelect v-model="dataForm.shippingAddress"
                 @change="changeData('deliveryAddress',-1)" :rowIndex="null" :formData="dataForm"
-                :templateJson="interfaceRes.deliveryAddress" placeholder="请选择"
+                :templateJson="interfaceRes.deliveryAddress" placeholder="请选择" :disabled="true"
-                :disabled="judgeWrite('deliveryAddress')" propsValue="id" popupWidth="800px"
+                propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
-                popupTitle="选择数据" popupType="dialog" relationField='addressDetail'
+                relationField='addressDetail' field='deliveryAddress'
-                field='deliveryAddress' interfaceId="522724961224231173" :pageSize="20"
+                interfaceId="522724961224231173" :pageSize="20"
                 :columnOptions="deliveryAddresscolumnOptions" clearable :style='{"width":"100%"}'>
               </JnpfPopupSelect>
             </jnpf-form-tip-item>
@@ -693,6 +693,11 @@ export default {
         { label: "货区类型", value: "cargo_type" },
         { label: "货区名称", value: "cargo_name" }
       ],
+      businessorderproductrelationalproductIdcolumnOptions2: [
+        { label: "商品编码", value: "code" },
+        { label: "商品名称", value: "name" },
+        { label: "商品规格", value: "spec" }
+      ],
       childIndex: -1,
       isEdit: false,
       interfaceRes: {

jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/form.vue

@@ -53,6 +53,15 @@
               </JnpfPopupSelect>
             </jnpf-form-tip-item>
           </el-col>
+          <el-col :span="8" v-if="judgeShow('voucherType')">
+            <jnpf-form-tip-item label="配送方式" v-if="judgeShow('voucherType')" prop="deliveryType">
+              <JnpfSelect v-model="dataForm.deliveryType" @change="changeData('voucherType', -1)"
+                placeholder="请选择" :disabled="judgeWrite('voucherType')" clearable
+                :style='{ "width": "100%" }' :options="deliveryTypeOptions"
+                :props="deliveryTypeProps">
+              </JnpfSelect>
+            </jnpf-form-tip-item>
+          </el-col>
           <el-col :span="24">
             <div style="padding:15px 0px">
               <span style="color: #409EFF;">▋</span>
@@ -667,6 +676,7 @@ export default {
       dataForm: {
         voucherCode: undefined,
         voucherType: '1',
+        deliveryType: undefined,
         preparationTime: new Date(),
         associateThirdSuppliers: undefined,
         voucherPictures: [],
@@ -711,6 +721,13 @@ export default {
             trigger: 'change'
           },
         ],
+        deliveryType: [
+          {
+            required: true,
+            message: '请选择',
+            trigger: 'change'
+          },
+        ],
         preparationTime: [
           {
             required: true,
@@ -838,9 +855,11 @@ export default {
           },
         ],
       },
+      deliveryTypeOptions: [{ "fullName": "仓配", "id": "1" }, { "fullName": "直送", "id": "2" }],
+      deliveryTypeProps: { "label": "fullName", "value": "id" },
       voucherTypeOptions: [{ "fullName": "磅单", "id": "1" }, { "fullName": "收据", "id": "2" }, { "fullName": "其他", "id": "3" }],
       voucherTypeProps: { "label": "fullName", "value": "id" },
-      associateThirdSupplierscolumnOptions: [{ "label": "供应商编码", "value": "code" }, { "label": "供应商名称", "value": "name" },],
+      associateThirdSupplierscolumnOptions: [{ "label": "供应商名称", "value": "name" }, { "label": "国家", "value": "country" }, { "label": "地址", "value": "address" }, { "label": "电话", "value": "phone" }],
       modeTransportOptions: [{ "fullName": "公路", "id": "1" }, { "fullName": "铁路", "id": "2" }, { "fullName": "轮船", "id": "3" }, { "fullName": "空运", "id": "4" }, { "fullName": "无", "id": "5" }],
       modeTransportProps: { "label": "fullName", "value": "id" },
       transportationMethodOptions: [{ "fullName": "仓库承运(DC)", "id": "1" }, { "fullName": "承运商", "id": "2" }, { "fullName": "供应商", "id": "3" }, { "fullName": "自提", "id": "4" }],
@@ -860,6 +879,7 @@ export default {
       interfaceRes: {
         voucherCode: [],
         voucherType: [],
+        deliveryType: [],
         preparationTime: [],
         associateThirdSuppliers: [],
         voucherPictures: [],

jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/form.vue

@@ -40,18 +40,13 @@
               </JnpfDatePicker>
             </jnpf-form-tip-item>
           </el-col>
-          <el-col :span="8" v-if="judgeShow('associateThirdSuppliers')">
+          <el-col :span="8" v-if="judgeShow('voucherType')">
-            <jnpf-form-tip-item label="三级供应商" v-if="judgeShow('associateThirdSuppliers')"
+            <jnpf-form-tip-item label="配送方式" v-if="judgeShow('voucherType')" prop="deliveryType">
-              prop="associateThirdSuppliers">
+              <JnpfSelect v-model="dataForm.deliveryType" @change="changeData('voucherType', -1)"
-              <JnpfPopupSelect v-model="dataForm.associateThirdSuppliers"
+                placeholder="请选择" :disabled="judgeWrite('voucherType')" clearable
-                @change="changeData('associateThirdSuppliers', -1)" :rowIndex="null"
+                :style='{ "width": "100%" }' :options="deliveryTypeOptions"
-                :formData="dataForm" :templateJson="interfaceRes.associateThirdSuppliers"
+                :props="deliveryTypeProps">
-                placeholder="请选择" :disabled="judgeWrite('associateThirdSuppliers')" propsValue="id"
+              </JnpfSelect>
-                popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='name'
-                field='associateThirdSuppliers' interfaceId="530001884988047877" :pageSize="20"
-                :hasPage="true" :columnOptions="associateThirdSupplierscolumnOptions" clearable
-                :style='{ "width": "100%" }'>
-              </JnpfPopupSelect>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="24">
@@ -664,6 +659,7 @@ export default {
         isSaleDeliveryVoucherSource: undefined,
         voucherCode: undefined,
         voucherType: '1',
+        deliveryType: undefined,
         preparationTime: new Date(),
         associateThirdSuppliers: undefined,
         voucherPictures: [],
@@ -708,6 +704,13 @@ export default {
             trigger: 'change'
           },
         ],
+        deliveryType: [
+          {
+            required: true,
+            message: '请选择',
+            trigger: 'change'
+          },
+        ],
         preparationTime: [
           {
             required: true,
@@ -814,6 +817,8 @@ export default {
           },
         ],
       },
+      deliveryTypeOptions: [{ "fullName": "仓配", "id": "1" }, { "fullName": "直送", "id": "2" }],
+      deliveryTypeProps: { "label": "fullName", "value": "id" },
       voucherTypeOptions: [{ "fullName": "磅单", "id": "1" }, { "fullName": "收据", "id": "2" }, { "fullName": "其他", "id": "3" }],
       voucherTypeProps: { "label": "fullName", "value": "id" },
       associateThirdSupplierscolumnOptions: [{ "label": "供应商编码", "value": "code" }, { "label": "供应商名称", "value": "name" },],
@@ -836,6 +841,7 @@ export default {
       interfaceRes: {
         voucherCode: [],
         voucherType: [],
+        deliveryType: [],
         preparationTime: [],
         associateThirdSuppliers: [],
         voucherPictures: [],

jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/receiptVoucher/form.vue

@@ -28,7 +28,6 @@
               </JnpfSelect>
             </jnpf-form-tip-item>
           </el-col>
-
           <el-col :span="8" v-if="judgeShow('preparationTime')">
             <jnpf-form-tip-item label="制单时间" v-if="judgeShow('preparationTime')"
               prop="preparationTime">
@@ -40,18 +39,13 @@
               </JnpfDatePicker>
             </jnpf-form-tip-item>
           </el-col>
-          <el-col :span="8" v-if="judgeShow('associateThirdSuppliers')">
+          <el-col :span="8" v-if="judgeShow('voucherType')">
-            <jnpf-form-tip-item label="三级供应商" v-if="judgeShow('associateThirdSuppliers')"
+            <jnpf-form-tip-item label="配送方式" v-if="judgeShow('voucherType')" prop="deliveryType">
-              prop="associateThirdSuppliers">
+              <JnpfSelect v-model="dataForm.deliveryType" @change="changeData('voucherType', -1)"
-              <JnpfPopupSelect v-model="dataForm.associateThirdSuppliers"
+                placeholder="请选择" :disabled="judgeWrite('voucherType')" clearable
-                @change="changeData('associateThirdSuppliers', -1)" :rowIndex="null"
+                :style='{ "width": "100%" }' :options="deliveryTypeOptions"
-                :formData="dataForm" :templateJson="interfaceRes.associateThirdSuppliers"
+                :props="deliveryTypeProps">
-                placeholder="请选择" :disabled="judgeWrite('associateThirdSuppliers')" propsValue="id"
+              </JnpfSelect>
-                popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='name'
-                field='associateThirdSuppliers' interfaceId="530001884988047877" :pageSize="20"
-                :hasPaage="true" :columnOptions="associateThirdSupplierscolumnOptions" clearable
-                :style='{ "width": "100%" }'>
-              </JnpfPopupSelect>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="24">
@@ -632,6 +626,7 @@ export default {
       dataForm: {
         voucherCode: undefined,
         voucherType: '1',
+        deliveryType: undefined,
         preparationTime: new Date(),
         associateThirdSuppliers: undefined,
         voucherPictures: [],
@@ -676,6 +671,13 @@ export default {
             trigger: 'change'
           },
         ],
+        deliveryType: [
+          {
+            required: true,
+            message: '请选择',
+            trigger: 'change'
+          },
+        ],
         preparationTime: [
           {
             required: true,
@@ -782,6 +784,8 @@ export default {
           },
         ],
       },
+      deliveryTypeOptions: [{ "fullName": "仓配", "id": "1" }, { "fullName": "直送", "id": "2" }],
+      deliveryTypeProps: { "label": "fullName", "value": "id" },
       voucherTypeOptions: [{ "fullName": "磅单", "id": "1" }, { "fullName": "收据", "id": "2" }, { "fullName": "其他", "id": "3" }],
       voucherTypeProps: { "label": "fullName", "value": "id" },
       associateThirdSupplierscolumnOptions: [{ "label": "供应商编码", "value": "code" }, { "label": "供应商名称", "value": "name" },],
@@ -804,6 +808,7 @@ export default {
       interfaceRes: {
         voucherCode: [],
         voucherType: [],
+        deliveryType: [],
         preparationTime: [],
         associateThirdSuppliers: [],
         voucherPictures: [],

jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleInBoundNotice/form.vue

@@ -350,10 +350,23 @@
                       v-if="judgeRequired('warehousingproductList-productName')">*</span>商品名称
                   </template>
                   <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.productName"
+                    <!-- <JnpfInput v-model="scope.row.productName"
                       @change="changeData('warehousingproduct-productName',scope.$index)"
                       placeholder="请输入" :disabled="true" clearable :style='{"width":"100%"}'>
-                    </JnpfInput>
+                    </JnpfInput> -->
+                    <JnpfPopupSelect v-model="scope.row.productId" @change="
+                        changeData(
+                          'warehousingproduct-productName',
+                          scope.$index
+                        )
+                      " :rowIndex="scope.$index" :formData="dataForm" :disabled="true"
+                      :templateJson="interfaceRes.warehousingproductproductName" placeholder="请选择"
+                      propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
+                      relationField="name" :field="'productId' + scope.$index"
+                      interfaceId="530009896687501829" :pageSize="20" :columnOptions="
+                        businessorderproductrelationalproductIdcolumnOptions2
+                      " clearable :style="{ width: '100%' }">
+                    </JnpfPopupSelect>
                   </template>
                 </el-table-column>
                 <el-table-column label="规格" v-if="judgeShow('warehousingproduct-spec')" prop="spec"
@@ -415,10 +428,24 @@
                       v-if="judgeRequired('warehousingproductList-storageAreaId')">*</span>出库货区
                   </template>
                   <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.storageAreaId"
+                    <!-- <JnpfInput v-model="scope.row.storageAreaId"
                       @change="changeData('warehousingproduct-storageAreaId',scope.$index)"
                       placeholder="请输入" :disabled="true" clearable :style='{"width":"100%"}'>
-                    </JnpfInput>
+                    </JnpfInput> -->
+                    <JnpfPopupSelect v-model="scope.row.storageAreaId" @change="
+                        changeData(
+                          'warehousingproductList-storageAreaId',
+                          scope.$index
+                        )
+                      " :rowIndex="scope.$index" :formData="dataForm" :templateJson="
+                        interfaceRes.deliveryproductrelationcargoId
+                      " placeholder="请选择" :disabled="true" propsValue="id" popupWidth="800px"
+                      popupTitle="选择数据" popupType="dialog" relationField="cargo_name"
+                      :field="'cargoId' + scope.$index" interfaceId="530700536261903749"
+                      :pageSize="20" :columnOptions="
+                        deliveryproductrelationcargoIdcolumnOptions
+                      " clearable :style="{ width: '100%' }">
+                    </JnpfPopupSelect>
                   </template>
                 </el-table-column>
                 <el-table-column label="出库单位"
@@ -450,6 +477,19 @@
                     </JnpfInput>
                   </template>
                 </el-table-column> -->
+                <el-table-column label="剩余可入库数量" v-if="judgeShow('warehousingproduct-barCode')"
+                  prop="remainingStockableQuantity" width="120">
+                  <template slot="header">
+                    <span class="required-sign"
+                      v-if="judgeRequired('warehousingproductList-barCode')">*</span>剩余可入库数量
+                  </template>
+                  <template slot-scope="scope">
+                    <JnpfInput v-model="scope.row.remainingStockableQuantity" @change="
+                        changeData('warehousingproduct-barCode', scope.$index)
+                      " placeholder="请输入" :disabled="true" clearable :style="{ width: '100%' }">
+                    </JnpfInput>
+                  </template>
+                </el-table-column>
                 <el-table-column label="通知出库数量"
                   v-if="judgeShow('warehousingproduct-notificationStorageNumber')"
                   prop="notificationStorageNumber" width="120">
@@ -658,9 +698,30 @@ export default {
       enterpriseIdcolumnOptions: [{ "label": "机构名称", "value": "f_full_name" },],
       warehouseIdcolumnOptions: [{ "label": "名称", "value": "name" },],
       deliveryAddresscolumnOptions: [{ "label": "地址详情", "value": "addressDetail" },],
+      businessorderproductrelationalproductIdcolumnOptions2: [
+        { label: "商品编码", value: "code" },
+        { label: "商品名称", value: "name" },
+        { label: "商品规格", value: "spec" }
+      ],
+      deliveryproductrelationcargoIdcolumnOptions: [
+        { label: "货区类型", value: "cargo_type" },
+        { label: "货区名称", value: "cargo_name" }
+      ],
       childIndex: -1,
       isEdit: false,
       interfaceRes: {
+        deliveryproductrelationcargoId: [
+          {
+            fieldName: "",
+            field: "businessOrganizeId",
+            defaultValue: "",
+            jnpfKey: "popupSelect",
+            dataType: "varchar",
+            id: "AyAmdw1",
+            relationField: "warehouseId",
+            required: "0"
+          }
+        ],
         warehousingType: [],
         warehousingCode: [],
         preparationTime: [],
@@ -726,15 +787,16 @@ export default {
           this.dataForm.enterpriseId = saleOrder.enterpriseId;
           this.dataForm.warehouseId = saleOrder.warehouseId;
           this.dataForm.shippingAddress = saleOrder.shippingAddress;
-          saleOrder.businessOrderProductRelationalList.forEach((item, index) => {
+          saleOrder.deliveryProductRelationEntityList.forEach((item, index) => {
             item.productName = item.name;
             item.purchaseUnitId = item.salesMainUnitId;
-            item.purchaseNum = item.businessNum;
+            item.purchaseNum = item.deliveryNum;
-            item.warehousingUnitId = item.salesMainUnitId;
+            item.storageAreaId = item.cargoId;
+            item.warehousingUnitId = item.deliveryUnit;
             item.produceDate = item.produceTime
           });
           debugger
-          this.dataForm.warehousingProductList = saleOrder.businessOrderProductRelationalList;
+          this.dataForm.warehousingProductList = saleOrder.deliveryProductRelationEntityList;
         })
       }
     },

jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOutBoundNotice/form.vue

@@ -790,6 +790,11 @@ export default {
         { label: "批次号", value: "batch_number" },
         { label: "库存数量", value: "inventory_number" },
       ],
+      businessorderproductrelationalproductIdcolumnOptions2: [
+        { label: "商品编码", value: "code" },
+        { label: "商品名称", value: "name" },
+        { label: "商品规格", value: "spec" }
+      ],
       childIndex: -1,
       isEdit: false,
       interfaceRes: {