Merge remote-tracking branch 'origin/main'

# Conflicts:
#	SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java

SC-boot/.gitignore

@@ -1,3 +1,7 @@
+#我的配置
+application-dev.yml
+application.yml
+*.yml
 # For Java
 *.lck
 target/
@@ -7,6 +11,7 @@ logback-test.xml
 
 application-dev.yml
 
+
 # Compiled class file
 *.class
 
@@ -75,3 +80,11 @@ config/base.yaml
 **/nacos/data/*
 **/nacos/logs/*
 **/seata/bin/*
+### Example user template template
+### Example user template
+
+# IntelliJ project files
+.idea
+*.iml
+out
+gen

SC-boot/linkage-common/src/main/java/jnpf/base/Pagination.java

@@ -23,8 +23,8 @@ public class Pagination extends Page{
     private String sidx="";
     @ApiModelProperty(value = "当前页数",example = "1")
     private long currentPage=1;
-
-
+    @ApiModelProperty(value = "菜单id")
+    private String menuId;
 
     @ApiModelProperty(hidden = true)
     @JsonIgnore

SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/mapper/ArinvoicesMapper.java

@@ -1,6 +1,7 @@
 package jnpf.arinvoices.mapper;
 
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import jnpf.arinvoices.entity.ArinvoicesEntity;
@@ -20,5 +21,5 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface ArinvoicesMapper extends BaseMapper<ArinvoicesEntity> {
 
-    IPage<ArinvoicesEntity> queryArinvoices(@Param("page") Page<ArinvoicesEntity> page, @Param("arinvoicesPagination") ArinvoicesPagination arinvoicesPagination);
+    IPage<ArinvoicesEntity> queryArinvoices(@Param("page") Page<ArinvoicesEntity> page, @Param("arinvoicesPagination") ArinvoicesPagination arinvoicesPagination, @Param("ew") Wrapper<ArinvoicesEntity> queryWrapper);
 }

SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/impl/ArinvoicesServiceImpl.java

@@ -77,6 +77,7 @@ public class ArinvoicesServiceImpl extends ServiceImpl<ArinvoicesMapper, Arinvoi
         int total=0;
 		int arinvoicesNum =0;
         QueryWrapper<ArinvoicesEntity> arinvoicesQueryWrapper=new QueryWrapper<>();
+        arinvoicesQueryWrapper.eq("a.delete_mark", "0");
 		int arinvoices_item0Num =0;
         QueryWrapper<Arinvoices_item0Entity> arinvoices_item0QueryWrapper=new QueryWrapper<>();
 		int arinvoices_item1Num =0;
@@ -86,7 +87,7 @@ public class ArinvoicesServiceImpl extends ServiceImpl<ArinvoicesMapper, Arinvoi
     boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
     if(isPc && pcPermission){
 		if (!userProvider.get().getIsAdministrator()){
-				Object arinvoicesObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoicesQueryWrapper,arinvoicesPagination.getMenuId(),"jg_arinvoices"));
+				Object arinvoicesObj=authorizeService.getCondition2(new AuthorizeConditionModel(arinvoicesQueryWrapper,arinvoicesPagination.getMenuId(),"jg_arinvoices"));
             if (ObjectUtil.isEmpty(arinvoicesObj)){
                 return new ArrayList<>();
             } else {
@@ -111,7 +112,7 @@ public class ArinvoicesServiceImpl extends ServiceImpl<ArinvoicesMapper, Arinvoi
     }
     if(!isPc && appPermission){
 		if (!userProvider.get().getIsAdministrator()){
-			Object arinvoicesObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoicesQueryWrapper,arinvoicesPagination.getMenuId(),"jg_arinvoices"));
+			Object arinvoicesObj=authorizeService.getCondition2(new AuthorizeConditionModel(arinvoicesQueryWrapper,arinvoicesPagination.getMenuId(),"jg_arinvoices"));
             if (ObjectUtil.isEmpty(arinvoicesObj)){
                 return new ArrayList<>();
             } else {
@@ -140,23 +141,6 @@ public class ArinvoicesServiceImpl extends ServiceImpl<ArinvoicesMapper, Arinvoi
 
 		}
     }
-			if(StringUtil.isNotEmpty(arinvoicesPagination.getDocumentNo())){
-            arinvoicesNum++;
-            arinvoicesQueryWrapper.lambda().like(ArinvoicesEntity::getDocumentNo,arinvoicesPagination.getDocumentNo());
-                    }
-
-			if(StringUtil.isNotEmpty(arinvoicesPagination.getBusinessDate())){
-            arinvoicesNum++;
-            List<String> BusinessDateList =  arinvoicesPagination.getBusinessDate();
-            Long fir = Long.valueOf(BusinessDateList.get(0));
-            Long sec = Long.valueOf(BusinessDateList.get(1));
-                arinvoicesPagination.setStartDate(new Date(fir));
-                arinvoicesPagination.setEndDate(DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
-//                arinvoicesQueryWrapper.lambda().ge(ArinvoicesEntity::getBusinessDate, new Date(fir))
-//            .le(ArinvoicesEntity::getBusinessDate, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
-
-                    }
-
         if(AllIdList.size()>0){
             arinvoicesQueryWrapper.lambda().in(ArinvoicesEntity::getId, AllIdList);
         }
@@ -197,7 +181,7 @@ public class ArinvoicesServiceImpl extends ServiceImpl<ArinvoicesMapper, Arinvoi
         if (StringUtil.isNotNull(detpartment)) {
             arinvoicesPagination.setDepartmentId(detpartment);
         }
-        IPage<ArinvoicesEntity> userIPage=arinvoicesMapper.queryArinvoices(page, arinvoicesPagination);
+        IPage<ArinvoicesEntity> userIPage=arinvoicesMapper.queryArinvoices(page, arinvoicesPagination, arinvoicesQueryWrapper);
         return arinvoicesPagination.setData(userIPage.getRecords(),userIPage.getTotal());
     }
     @Override

SC-boot/linkage-scm/src/main/java/jnpf/collection/mapper/CollectionMapper.java

@@ -1,8 +1,10 @@
 package jnpf.collection.mapper;
 
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import jnpf.arinvoices.entity.ArinvoicesEntity;
 import jnpf.collection.entity.CollectionEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import jnpf.collection.model.collection.CollectionPagination;
@@ -29,5 +31,5 @@ public interface CollectionMapper extends BaseMapper<CollectionEntity> {
 
     List<ContractFileEntity> queryContract(String code);
 
-    IPage<CollectionEntity> queryCollection(@Param("page") Page<CollectionEntity> page, @Param("collectionPagination") CollectionPagination collectionPagination);
+    IPage<CollectionEntity> queryCollection(@Param("page") Page<CollectionEntity> page, @Param("collectionPagination") CollectionPagination collectionPagination, @Param("ew") Wrapper<CollectionEntity> queryWrapper);
 }

SC-boot/linkage-scm/src/main/java/jnpf/collection/service/impl/CollectionServiceImpl.java

@@ -85,6 +85,7 @@ public class CollectionServiceImpl extends ServiceImpl<CollectionMapper, Collect
         int total=0;
         int collectionNum =0;
         QueryWrapper<CollectionEntity> collectionQueryWrapper=new QueryWrapper<>();
+        collectionQueryWrapper.eq("a.delete_mark", "0");
         int collection_item0Num =0;
         QueryWrapper<Collection_item0Entity> collection_item0QueryWrapper=new QueryWrapper<>();
         boolean pcPermission = true;
@@ -92,7 +93,7 @@ public class CollectionServiceImpl extends ServiceImpl<CollectionMapper, Collect
         boolean    isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
         if(isPc && pcPermission){
             if (!userProvider.get().getIsAdministrator()){
-                Object collectionObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionQueryWrapper,collectionPagination.getMenuId(),"jg_collection"));
+                Object collectionObj=authorizeService.getCondition2(new AuthorizeConditionModel(collectionQueryWrapper,collectionPagination.getMenuId(),"jg_collection"));
                 if (ObjectUtil.isEmpty(collectionObj)){
                     return new ArrayList<>();
                 } else {
@@ -110,7 +111,7 @@ public class CollectionServiceImpl extends ServiceImpl<CollectionMapper, Collect
         }
         if(!isPc && appPermission){
             if (!userProvider.get().getIsAdministrator()){
-                Object collectionObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionQueryWrapper,collectionPagination.getMenuId(),"jg_collection"));
+                Object collectionObj=authorizeService.getCondition2(new AuthorizeConditionModel(collectionQueryWrapper,collectionPagination.getMenuId(),"jg_collection"));
                 if (ObjectUtil.isEmpty(collectionObj)){
                     return new ArrayList<>();
                 } else {
@@ -130,11 +131,6 @@ public class CollectionServiceImpl extends ServiceImpl<CollectionMapper, Collect
 
             }
         }
-        if(StringUtil.isNotEmpty(collectionPagination.getDocumentNo())){
-            collectionNum++;
-            collectionQueryWrapper.lambda().like(CollectionEntity::getDocumentNo,collectionPagination.getDocumentNo());
-        }
-
         if(AllIdList.size()>0){
             collectionQueryWrapper.lambda().in(CollectionEntity::getId, AllIdList);
         }
@@ -176,7 +172,7 @@ public class CollectionServiceImpl extends ServiceImpl<CollectionMapper, Collect
         if (StringUtil.isNotNull(detpartment)) {
             collectionPagination.setDepartmentId(detpartment);
         }
-        IPage<CollectionEntity> userIPage=collectionMapper.queryCollection(page, collectionPagination);
+        IPage<CollectionEntity> userIPage=collectionMapper.queryCollection(page, collectionPagination, collectionQueryWrapper);
         return collectionPagination.setData(userIPage.getRecords(),userIPage.getTotal());
     }
     @Override

SC-boot/linkage-scm/src/main/java/jnpf/invoices/mapper/InvoicesMapper.java

@@ -1,8 +1,10 @@
 package jnpf.invoices.mapper;
 
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import jnpf.collection.entity.CollectionEntity;
 import jnpf.invoices.entity.InvoicesEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import jnpf.invoices.model.invoices.InvoicesPagination;
@@ -18,5 +20,5 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface InvoicesMapper extends BaseMapper<InvoicesEntity> {
 
-    IPage<InvoicesEntity> queryByKeyword(@Param("page") Page<InvoicesEntity> page, @Param("invoicesPagination") InvoicesPagination invoicesPagination);
+    IPage<InvoicesEntity> queryByKeyword(@Param("page") Page<InvoicesEntity> page, @Param("invoicesPagination") InvoicesPagination invoicesPagination, @Param("ew") Wrapper<InvoicesEntity> queryWrapper);
 }

SC-boot/linkage-scm/src/main/java/jnpf/invoices/service/impl/InvoicesServiceImpl.java

@@ -84,6 +84,7 @@ public class InvoicesServiceImpl extends ServiceImpl<InvoicesMapper, InvoicesEnt
         int total=0;
 		int invoicesNum =0;
         QueryWrapper<InvoicesEntity> invoicesQueryWrapper=new QueryWrapper<>();
+        invoicesQueryWrapper.eq("a.delete_mark", "0");
 		int invoicesItem0Num =0;
         QueryWrapper<InvoicesItem0Entity> invoicesItem0QueryWrapper=new QueryWrapper<>();
 		int invoicesItem1Num =0;
@@ -93,7 +94,7 @@ public class InvoicesServiceImpl extends ServiceImpl<InvoicesMapper, InvoicesEnt
     boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
     if(isPc && pcPermission){
 		if (!userProvider.get().getIsAdministrator()){
-				Object invoicesObj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesQueryWrapper,invoicesPagination.getMenuId(),"jg_invoices"));
+				Object invoicesObj=authorizeService.getCondition2(new AuthorizeConditionModel(invoicesQueryWrapper,invoicesPagination.getMenuId(),"jg_invoices"));
             if (ObjectUtil.isEmpty(invoicesObj)){
                 return new ArrayList<>();
             } else {
@@ -118,7 +119,7 @@ public class InvoicesServiceImpl extends ServiceImpl<InvoicesMapper, InvoicesEnt
     }
     if(!isPc && appPermission){
 		if (!userProvider.get().getIsAdministrator()){
-			Object invoicesObj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesQueryWrapper,invoicesPagination.getMenuId(),"jg_invoices"));
+			Object invoicesObj=authorizeService.getCondition2(new AuthorizeConditionModel(invoicesQueryWrapper,invoicesPagination.getMenuId(),"jg_invoices"));
             if (ObjectUtil.isEmpty(invoicesObj)){
                 return new ArrayList<>();
             } else {
@@ -189,7 +190,7 @@ public class InvoicesServiceImpl extends ServiceImpl<InvoicesMapper, InvoicesEnt
         if (StringUtil.isNotNull(detpartment)) {
             invoicesPagination.setDepartmentId(detpartment);
         }
-        IPage<InvoicesEntity> userIPage=invoicesMapper.queryByKeyword(page, invoicesPagination);
+        IPage<InvoicesEntity> userIPage=invoicesMapper.queryByKeyword(page, invoicesPagination, invoicesQueryWrapper);
         return invoicesPagination.setData(userIPage.getRecords(),userIPage.getTotal());
 
 

SC-boot/linkage-scm/src/main/java/jnpf/mobilePort/controller/MobilePortController.java

@@ -55,7 +55,7 @@ public class MobilePortController {
     @GetMapping(value = "/getPaymentDocPdf/{id}", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public void getPaymentDocPdf(HttpServletResponse response,@PathVariable("id") String id) throws IOException {
         String idd="410787543580384837";
-        paymentdocService.getPaymentDocPdf(idd);
+        paymentdocService.getPaymentDocPdf(id);
     }
 
 

SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistPagination.java

@@ -43,6 +43,9 @@ public class PoundlistPagination extends Pagination {
     private List<String> poundlistIds;
     private String businessId;
 
+    private String purchaseStatus;
+    private String salesStatus;
+
     /**
      * 添加权限
      */

SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/mapper/PurchasebackMapper.java

@@ -1,8 +1,10 @@
 package jnpf.purchaseback.mapper;
 
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import jnpf.invoices.entity.InvoicesEntity;
 import jnpf.purchaseback.entity.PurchasebackEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import jnpf.purchaseback.model.purchaseback.PurchasebackPagination;
@@ -18,5 +20,5 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface PurchasebackMapper extends BaseMapper<PurchasebackEntity> {
 
-    IPage<PurchasebackEntity> queryByKeyword(@Param("page") Page<PurchasebackEntity> page, @Param("purchasebackPagination") PurchasebackPagination purchasebackPagination);
+    IPage<PurchasebackEntity> queryByKeyword(@Param("page") Page<PurchasebackEntity> page, @Param("purchasebackPagination") PurchasebackPagination purchasebackPagination, @Param("ew") Wrapper<PurchasebackEntity> queryWrapper);
 }

SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/service/impl/PurchasebackServiceImpl.java

@@ -76,6 +76,7 @@ public class PurchasebackServiceImpl extends ServiceImpl<PurchasebackMapper, Pur
         int total=0;
 		int purchasebackNum =0;
         QueryWrapper<PurchasebackEntity> purchasebackQueryWrapper=new QueryWrapper<>();
+        purchasebackQueryWrapper.eq("a.delete_mark", "0");
 		int purchaseback_item0Num =0;
         QueryWrapper<Purchaseback_item0Entity> purchaseback_item0QueryWrapper=new QueryWrapper<>();
 		int purchaseorderNum =0;
@@ -85,7 +86,7 @@ public class PurchasebackServiceImpl extends ServiceImpl<PurchasebackMapper, Pur
     boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
     if(isPc && pcPermission){
 		if (!userProvider.get().getIsAdministrator()){
-				Object purchasebackObj=authorizeService.getCondition(new AuthorizeConditionModel(purchasebackQueryWrapper,purchasebackPagination.getMenuId(),"jg_purchaseback"));
+				Object purchasebackObj=authorizeService.getCondition2(new AuthorizeConditionModel(purchasebackQueryWrapper,purchasebackPagination.getMenuId(),"jg_purchaseback"));
             if (ObjectUtil.isEmpty(purchasebackObj)){
                 return new ArrayList<>();
             } else {
@@ -110,7 +111,7 @@ public class PurchasebackServiceImpl extends ServiceImpl<PurchasebackMapper, Pur
     }
     if(!isPc && appPermission){
 		if (!userProvider.get().getIsAdministrator()){
-			Object purchasebackObj=authorizeService.getCondition(new AuthorizeConditionModel(purchasebackQueryWrapper,purchasebackPagination.getMenuId(),"jg_purchaseback"));
+			Object purchasebackObj=authorizeService.getCondition2(new AuthorizeConditionModel(purchasebackQueryWrapper,purchasebackPagination.getMenuId(),"jg_purchaseback"));
             if (ObjectUtil.isEmpty(purchasebackObj)){
                 return new ArrayList<>();
             } else {
@@ -174,7 +175,7 @@ public class PurchasebackServiceImpl extends ServiceImpl<PurchasebackMapper, Pur
         if (StringUtil.isNotNull(detpartment)) {
             purchasebackPagination.setDepartmentId(detpartment);
         }
-        IPage<PurchasebackEntity> userIPage = purchasebackMapper.queryByKeyword(page, purchasebackPagination);
+        IPage<PurchasebackEntity> userIPage = purchasebackMapper.queryByKeyword(page, purchasebackPagination, purchasebackQueryWrapper);
         return purchasebackPagination.setData(userIPage.getRecords(),userIPage.getTotal());
 			/*if(StringUtil.isNotEmpty(purchasebackPagination.getDocumentNo())){
             purchasebackNum++;

SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java

@@ -1981,24 +1981,10 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
                     BigDecimal settlement = model.getSettlement();
                     BigDecimal purchasePrice = model.getPurchasePrice();
 //                采购单价
-                    /*modified by Allen START*/
-                    if(settlement.compareTo(BigDecimal.ZERO)==0){
-                        model.setPurchasePrice(BigDecimal.ZERO);
-                    }else{
-                        model.setPurchasePrice(purchasePrice.divide(settlement,6, RoundingMode.CEILING).setScale(6, RoundingMode.HALF_UP));
-                    }
-                    /*modified by Allen END*/
-
+                    model.setPurchasePrice(purchasePrice.divide(settlement,6, RoundingMode.CEILING).setScale(6, RoundingMode.HALF_UP));
                     BigDecimal salesPrice = model.getSalesPrice();
 //                销售单价
-                    /*modified by Allen START*/
-                    if(salesPrice.compareTo(BigDecimal.ZERO)==0){
-                        model.setSalesPrice(BigDecimal.ZERO);
-                    }else{
-                        model.setSalesPrice(salesPrice.divide(settlement, 6,RoundingMode.CEILING).setScale(6, RoundingMode.HALF_UP));
-                    }
-                    /*modified by Allen END*/
-
+                    model.setSalesPrice(salesPrice.divide(settlement, 6,RoundingMode.CEILING).setScale(6, RoundingMode.HALF_UP));
 //            是否审核
                     model.setIsExamine("1");
 //            磅单类型

SC-boot/linkage-scm/src/main/java/jnpf/receiptout/mapper/ReceiptoutMapper.java

@@ -1,8 +1,10 @@
 package jnpf.receiptout.mapper;
 
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import jnpf.purchaseback.entity.PurchasebackEntity;
 import jnpf.receiptout.entity.ReceiptoutEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import jnpf.receiptout.model.receiptout.ReceiptoutPagination;
@@ -19,5 +21,5 @@ import org.apache.ibatis.annotations.Param;
  * 日期： 2023-02-24
  */
 public interface ReceiptoutMapper extends BaseMapper<ReceiptoutEntity> {
-    IPage<ReceiptoutEntity> queryReceiptout(@Param("page") Page<ReceiptoutEntity> page, @Param("receiptoutPagination") ReceiptoutPagination receiptoutPagination);
+    IPage<ReceiptoutEntity> queryReceiptout(@Param("page") Page<ReceiptoutEntity> page, @Param("receiptoutPagination") ReceiptoutPagination receiptoutPagination, @Param("ew") Wrapper<ReceiptoutEntity> queryWrapper);
 }

SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/impl/ReceiptoutServiceImpl.java

@@ -74,6 +74,7 @@ public class ReceiptoutServiceImpl extends ServiceImpl<ReceiptoutMapper, Receipt
         int total=0;
 		int receiptoutNum =0;
         QueryWrapper<ReceiptoutEntity> receiptoutQueryWrapper=new QueryWrapper<>();
+        receiptoutQueryWrapper.eq("a.delete_mark", "0");
 		int receiptout_item0Num =0;
         QueryWrapper<Receiptout_item0Entity> receiptout_item0QueryWrapper=new QueryWrapper<>();
     boolean pcPermission = true;
@@ -81,7 +82,7 @@ public class ReceiptoutServiceImpl extends ServiceImpl<ReceiptoutMapper, Receipt
     boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
     if(isPc && pcPermission){
 		if (!userProvider.get().getIsAdministrator()){
-				Object receiptoutObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutQueryWrapper,receiptoutPagination.getMenuId(),"jg_receiptout"));
+				Object receiptoutObj=authorizeService.getCondition2(new AuthorizeConditionModel(receiptoutQueryWrapper,receiptoutPagination.getMenuId(),"jg_receiptout"));
             if (ObjectUtil.isEmpty(receiptoutObj)){
                 return new ArrayList<>();
             } else {
@@ -99,7 +100,7 @@ public class ReceiptoutServiceImpl extends ServiceImpl<ReceiptoutMapper, Receipt
     }
     if(!isPc && appPermission){
 		if (!userProvider.get().getIsAdministrator()){
-			Object receiptoutObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutQueryWrapper,receiptoutPagination.getMenuId(),"jg_receiptout"));
+			Object receiptoutObj=authorizeService.getCondition2(new AuthorizeConditionModel(receiptoutQueryWrapper,receiptoutPagination.getMenuId(),"jg_receiptout"));
             if (ObjectUtil.isEmpty(receiptoutObj)){
                 return new ArrayList<>();
             } else {
@@ -119,7 +120,7 @@ public class ReceiptoutServiceImpl extends ServiceImpl<ReceiptoutMapper, Receipt
 
 		}
     }
-			if(StringUtil.isNotEmpty(receiptoutPagination.getDocumentNo())){
+		/*	if(StringUtil.isNotEmpty(receiptoutPagination.getDocumentNo())){
             receiptoutNum++;
             receiptoutQueryWrapper.lambda().like(ReceiptoutEntity::getDocumentNo,receiptoutPagination.getDocumentNo());
                     }
@@ -134,7 +135,7 @@ public class ReceiptoutServiceImpl extends ServiceImpl<ReceiptoutMapper, Receipt
             Long sec = Long.valueOf(creatorTime.get(1));
             receiptoutPagination.setStartDate(new Date(fir));
             receiptoutPagination.setEndDate(DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
-        }
+        }*/
 
         if(AllIdList.size()>0){
             receiptoutQueryWrapper.lambda().in(ReceiptoutEntity::getId, AllIdList);
@@ -176,7 +177,7 @@ public class ReceiptoutServiceImpl extends ServiceImpl<ReceiptoutMapper, Receipt
         if (StringUtil.isNotNull(detpartment)) {
             receiptoutPagination.setDepartmentId(detpartment);
         }
-        IPage<ReceiptoutEntity> userIPage=receiptoutMapper.queryReceiptout(page, receiptoutPagination);
+        IPage<ReceiptoutEntity> userIPage=receiptoutMapper.queryReceiptout(page, receiptoutPagination, receiptoutQueryWrapper);
         return receiptoutPagination.setData(userIPage.getRecords(),userIPage.getTotal());
     }
     @Override

SC-boot/linkage-scm/src/main/java/jnpf/saleback/entity/SalebackEntity.java

@@ -81,7 +81,7 @@ public class SalebackEntity  {
     private String remark;
 
     @TableField("ACTUAL_AMOUNT")
-    private String actualAmount;
+    private BigDecimal actualAmount;
 
     @TableField("STATUS")
     private String status;

SC-boot/linkage-scm/src/main/java/jnpf/saleback/mapper/SalebackMapper.java

@@ -1,8 +1,10 @@
 package jnpf.saleback.mapper;
 
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import jnpf.receiptout.entity.ReceiptoutEntity;
 import jnpf.saleback.entity.SalebackEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import jnpf.saleback.entity.Saleback_item0Entity;
@@ -23,7 +25,7 @@ import java.util.List;
  * 日期： 2023-01-13
  */
 public interface SalebackMapper extends BaseMapper<SalebackEntity> {
-    IPage<SalebackEntity> querySaleBack(@Param("page") Page<SalebackEntity> page, @Param("salebackPagination") SalebackPagination salebackPagination);
+    IPage<SalebackEntity> querySaleBack(@Param("page") Page<SalebackEntity> page, @Param("salebackPagination") SalebackPagination salebackPagination, @Param("ew") Wrapper<SalebackEntity> queryWrapper);
 
     List<Saleback_item0Entity> querySaleBackItem(String id);
 }

SC-boot/linkage-scm/src/main/java/jnpf/saleback/service/impl/SalebackServiceImpl.java

@@ -72,6 +72,7 @@ public class SalebackServiceImpl extends ServiceImpl<SalebackMapper, SalebackEnt
         int total=0;
 		int salebackNum =0;
         QueryWrapper<SalebackEntity> salebackQueryWrapper=new QueryWrapper<>();
+        salebackQueryWrapper.eq("a.delete_mark", "0");
 		int saleback_item0Num =0;
         QueryWrapper<Saleback_item0Entity> saleback_item0QueryWrapper=new QueryWrapper<>();
 
@@ -80,7 +81,7 @@ public class SalebackServiceImpl extends ServiceImpl<SalebackMapper, SalebackEnt
     boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
     if(isPc && pcPermission){
 		if (!userProvider.get().getIsAdministrator()){
-				Object salebackObj=authorizeService.getCondition(new AuthorizeConditionModel(salebackQueryWrapper,salebackPagination.getMenuId(),"jg_saleback"));
+				Object salebackObj=authorizeService.getCondition2(new AuthorizeConditionModel(salebackQueryWrapper,salebackPagination.getMenuId(),"jg_saleback"));
             if (ObjectUtil.isEmpty(salebackObj)){
                 return new ArrayList<>();
             } else {
@@ -98,7 +99,7 @@ public class SalebackServiceImpl extends ServiceImpl<SalebackMapper, SalebackEnt
     }
     if(!isPc && appPermission){
 		if (!userProvider.get().getIsAdministrator()){
-			Object salebackObj=authorizeService.getCondition(new AuthorizeConditionModel(salebackQueryWrapper,salebackPagination.getMenuId(),"jg_saleback"));
+			Object salebackObj=authorizeService.getCondition2(new AuthorizeConditionModel(salebackQueryWrapper,salebackPagination.getMenuId(),"jg_saleback"));
             if (ObjectUtil.isEmpty(salebackObj)){
                 return new ArrayList<>();
             } else {
@@ -119,20 +120,6 @@ public class SalebackServiceImpl extends ServiceImpl<SalebackMapper, SalebackEnt
 
 		}
     }
-			if(StringUtil.isNotEmpty(salebackPagination.getDocumentNo())){
-            salebackNum++;
-            salebackQueryWrapper.lambda().like(SalebackEntity::getDocumentNo,salebackPagination.getDocumentNo());
-                    }
-        if(StringUtil.isNotEmpty(salebackPagination.getCreatorTime())){
-            List<String> creatorTime =  salebackPagination.getCreatorTime();
-            Long fir = Long.valueOf(creatorTime.get(0));
-            Long sec = Long.valueOf(creatorTime.get(1));
-            salebackPagination.setStartDate(new Date(fir));
-            salebackPagination.setEndDate(DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
-//                saleorderitemQueryWrapper.lambda().ge(SaleorderitemEntity::getCreatorTime, new Date(fir))
-//                    .le(SaleorderitemEntity::getCreatorTime, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
-
-        }
 
         if(AllIdList.size()>0){
             salebackQueryWrapper.lambda().in(SalebackEntity::getId, AllIdList);
@@ -174,7 +161,7 @@ public class SalebackServiceImpl extends ServiceImpl<SalebackMapper, SalebackEnt
         if (StringUtil.isNotNull(detpartment)) {
                 salebackPagination.setDepartmentId(detpartment);
         }
-        IPage<SalebackEntity> userIPage=salebackMapper.querySaleBack(page, salebackPagination);
+        IPage<SalebackEntity> userIPage=salebackMapper.querySaleBack(page, salebackPagination, salebackQueryWrapper);
         return salebackPagination.setData(userIPage.getRecords(),userIPage.getTotal());
     }
     @Override

SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java

@@ -545,11 +545,14 @@ public class SaleorderitemController {
                 salesorder_item0Service.save(entitys);
             }
             if (StringUtils.isNotEmpty(saleorderitemCrForm.getIsTransfer()) && saleorderitemCrForm.getIsTransfer().equals("1")){
-                if (StringUtils.isNotEmpty(saleorderitemCrForm.getPurchaseOrderId())){
-                    PurchaseorderitemEntity purchaseorderitemEntity = purchaseorderitemService.getById(saleorderitemCrForm.getPurchaseOrderId());
-                    if (ObjectUtils.isNotEmpty(purchaseorderitemEntity)){
-                        purchaseorderitemEntity.setIsTransfer("1");
-                        purchaseorderitemService.updateById(purchaseorderitemEntity);
+                String[] purchaseIdList = saleorderitemCrForm.getPurchaseOrderId().split(",");
+                for (String purchaseId : purchaseIdList) {
+                    if (StringUtils.isNotEmpty(purchaseId)) {
+                        PurchaseorderitemEntity purchaseorderitemEntity = purchaseorderitemService.getById(purchaseId);
+                        if (ObjectUtils.isNotEmpty(purchaseorderitemEntity)) {
+                            purchaseorderitemEntity.setIsTransfer("1");
+                            purchaseorderitemService.updateById(purchaseorderitemEntity);
+                        }
                     }
                 }
             }

SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/SalesbacksoitemEntity.java

@@ -81,7 +81,7 @@ public class SalesbacksoitemEntity  {
     private String remark;
 
     @TableField("ACTUAL_AMOUNT")
-    private String actualAmount;
+    private BigDecimal actualAmount;
 
     @TableField("STATUS")
     private String status;

SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/SaleorderitemMapper.java

@@ -1,12 +1,14 @@
 package jnpf.saleorder.mapper;
 
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import jnpf.arinvoices.entity.ArinvoicesEntity;
 import jnpf.poundlist.entity.PoundlistEntity;
 import jnpf.poundlist.model.poundlist.PoundlistPagination;
 import jnpf.receiptout.entity.Receiptout_item0Entity;
+import jnpf.saleback.entity.SalebackEntity;
 import jnpf.saleorder.entity.SaleorderitemEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import jnpf.saleorder.entity.Salesorder_item0Entity;
@@ -24,7 +26,7 @@ import java.util.List;
  * 日期： 2023-02-22
  */
 public interface SaleorderitemMapper extends BaseMapper<SaleorderitemEntity> {
-    IPage<SaleorderitemEntity> querySalesOrder(@Param("page") Page<SaleorderitemEntity> page, @Param("saleorderitemPagination") SaleorderitemPagination saleorderitemPagination);
+    IPage<SaleorderitemEntity> querySalesOrder(@Param("page") Page<SaleorderitemEntity> page, @Param("saleorderitemPagination") SaleorderitemPagination saleorderitemPagination, @Param("ew") Wrapper<SaleorderitemEntity> queryWrapper);
     PoundlistEntity queryPoundlist(String poundlistId);
     List<Salesorder_item0Entity> querySaleOrderItem(String id);
     List<Receiptout_item0Entity> queryReceiptoutItem(String id);

SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/SaleorderitemServiceImpl.java

@@ -93,6 +93,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
         int total=0;
 		int saleorderitemNum =0;
         QueryWrapper<SaleorderitemEntity> saleorderitemQueryWrapper=new QueryWrapper<>();
+        saleorderitemQueryWrapper.eq("a.delete_mark","0");
 		int salesorder_item0Num =0;
         QueryWrapper<Salesorder_item0Entity> salesorder_item0QueryWrapper=new QueryWrapper<>();
 		int receiptoutsoitemNum =0;
@@ -110,7 +111,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
     boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
     if(isPc && pcPermission){
 		if (!userProvider.get().getIsAdministrator()){
-				Object saleorderitemObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderitemQueryWrapper,saleorderitemPagination.getMenuId(),"jg_saleorder"));
+				Object saleorderitemObj=authorizeService.getCondition2(new AuthorizeConditionModel(saleorderitemQueryWrapper,saleorderitemPagination.getMenuId(),"jg_saleorder"));
             if (ObjectUtil.isEmpty(saleorderitemObj)){
                 return new ArrayList<>();
             } else {
@@ -163,7 +164,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
     }
     if(!isPc && appPermission){
 		if (!userProvider.get().getIsAdministrator()){
-			Object saleorderitemObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderitemQueryWrapper,saleorderitemPagination.getMenuId(),"jg_saleorder"));
+			Object saleorderitemObj=authorizeService.getCondition2(new AuthorizeConditionModel(saleorderitemQueryWrapper,saleorderitemPagination.getMenuId(),"jg_saleorder"));
             if (ObjectUtil.isEmpty(saleorderitemObj)){
                 return new ArrayList<>();
             } else {
@@ -228,27 +229,6 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
 
 		}
     }
-			if(StringUtil.isNotEmpty(saleorderitemPagination.getDocumentNo())){
-            saleorderitemNum++;
-            saleorderitemQueryWrapper.lambda().like(SaleorderitemEntity::getDocumentNo,saleorderitemPagination.getDocumentNo());
-                    }
-
-			if(StringUtil.isNotEmpty(saleorderitemPagination.getStatus())){
-            saleorderitemNum++;
-                saleorderitemQueryWrapper.lambda().eq(SaleorderitemEntity::getStatus,saleorderitemPagination.getStatus());
-                    }
-			if(StringUtil.isNotEmpty(saleorderitemPagination.getCreatorTime())){
-            saleorderitemNum++;
-            List<String> creatorTime =  saleorderitemPagination.getCreatorTime();
-            Long fir = Long.valueOf(creatorTime.get(0));
-            Long sec = Long.valueOf(creatorTime.get(1));
-            saleorderitemPagination.setStartDate(new Date(fir));
-            saleorderitemPagination.setEndDate(DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
-                saleorderitemQueryWrapper.lambda().ge(SaleorderitemEntity::getCreatorTime, new Date(fir))
-                    .le(SaleorderitemEntity::getCreatorTime, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
-
-        }
-
         if(AllIdList.size()>0){
             saleorderitemQueryWrapper.lambda().in(SaleorderitemEntity::getId, AllIdList);
         }
@@ -291,7 +271,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
         }
 
 
-        IPage<SaleorderitemEntity> userIPage=saleorderitemMapper.querySalesOrder(page, saleorderitemPagination);
+        IPage<SaleorderitemEntity> userIPage=saleorderitemMapper.querySalesOrder(page, saleorderitemPagination, saleorderitemQueryWrapper);
         return saleorderitemPagination.setData(userIPage.getRecords(),userIPage.getTotal());
     }
     @Override

SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/mapper/TradeuploadMapper.java

@@ -4,6 +4,7 @@ package jnpf.tradeupload.mapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import jnpf.saleorder.entity.SaleorderitemEntity;
 import jnpf.tradeupload.entity.TradeuploadEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import jnpf.tradeupload.model.tradeupload.TradeuploadPagination;
@@ -23,5 +24,5 @@ import java.util.List;
 public interface TradeuploadMapper extends BaseMapper<TradeuploadEntity> {
     List<TradeuploadEntity> queryVehicle(TradeuploadEntity tradeuploadEntity);
 
-    IPage<TradeuploadEntity> queryByKeyword(@Param("page") Page<TradeuploadEntity> page, @Param("tradeuploadPagination") TradeuploadPagination tradeuploadPagination);
+    IPage<TradeuploadEntity> queryByKeyword(@Param("page") Page<TradeuploadEntity> page, @Param("tradeuploadPagination") TradeuploadPagination tradeuploadPagination, @Param("ew") Wrapper<TradeuploadEntity> queryWrapper);
 }

SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/service/impl/TradeuploadServiceImpl.java

@@ -86,14 +86,14 @@ public class TradeuploadServiceImpl extends ServiceImpl<TradeuploadMapper, Trade
         int total=0;
 		int tradeuploadNum =0;
         QueryWrapper<TradeuploadEntity> tradeuploadQueryWrapper=new QueryWrapper<>();
-        tradeuploadQueryWrapper.lambda().eq(TradeuploadEntity::getIsExamine,"0");
-        tradeuploadQueryWrapper.lambda().eq(TradeuploadEntity::getPoundType,"0");
+        tradeuploadQueryWrapper.eq("a.is_examine","0");
+        tradeuploadQueryWrapper.eq("a.delete_mark","0");
     boolean pcPermission = true;
     boolean appPermission = true;
     boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
     if(isPc && pcPermission){
 		if (!userProvider.get().getIsAdministrator()){
-				Object tradeuploadObj=authorizeService.getCondition(new AuthorizeConditionModel(tradeuploadQueryWrapper,tradeuploadPagination.getMenuId(),"jg_poundlist"));
+				Object tradeuploadObj=authorizeService.getCondition2(new AuthorizeConditionModel(tradeuploadQueryWrapper,tradeuploadPagination.getMenuId(),"jg_poundlist"));
             if (ObjectUtil.isEmpty(tradeuploadObj)){
                 return new ArrayList<>();
             } else {
@@ -104,7 +104,7 @@ public class TradeuploadServiceImpl extends ServiceImpl<TradeuploadMapper, Trade
     }
     if(!isPc && appPermission){
 		if (!userProvider.get().getIsAdministrator()){
-			Object tradeuploadObj=authorizeService.getCondition(new AuthorizeConditionModel(tradeuploadQueryWrapper,tradeuploadPagination.getMenuId(),"jg_poundlist"));
+			Object tradeuploadObj=authorizeService.getCondition2(new AuthorizeConditionModel(tradeuploadQueryWrapper,tradeuploadPagination.getMenuId(),"jg_poundlist"));
             if (ObjectUtil.isEmpty(tradeuploadObj)){
                 return new ArrayList<>();
             } else {
@@ -165,7 +165,7 @@ public class TradeuploadServiceImpl extends ServiceImpl<TradeuploadMapper, Trade
         }
 
 //        tradeuploadPagination.setDepartmentId(detpartment);
-        IPage<TradeuploadEntity> userIPage = tradeuploadMapper.queryByKeyword(page, tradeuploadPagination);
+        IPage<TradeuploadEntity> userIPage = tradeuploadMapper.queryByKeyword(page, tradeuploadPagination, tradeuploadQueryWrapper);
         return tradeuploadPagination.setData(userIPage.getRecords(),userIPage.getTotal());
     /*
 

SC-boot/linkage-scm/src/main/resources/mapper/arinvoices/ArinvoicesMapper.xml

@@ -13,15 +13,7 @@
     	LEFT JOIN jg_customer b ON a.customer_id = b.id and b.delete_mark = '0'
     	LEFT JOIN jg_contract c ON a.contract_id = c.id and c.delete_mark = '0'
     	LEFT JOIN jg_salesorder d ON a.sales_order_id = d.id and d.delete_mark = '0'
-    WHERE 1=1
-    and a.delete_mark = '0'
-    /*添加权限*/
-    <if test="arinvoicesPagination.departmentId != null and arinvoicesPagination.departmentId != ''">
-        AND a.department_id = #{arinvoicesPagination.departmentId}
-    </if>
-    <if test="arinvoicesPagination.orgnizeId != null and arinvoicesPagination.orgnizeId != ''">
-        AND a.orgnize_id = #{arinvoicesPagination.orgnizeId}
-    </if>
+    ${ew.customSqlSegment}
     <if test="arinvoicesPagination.documentNo != null and arinvoicesPagination.documentNo != ''">
         and a.document_no  LIKE CONCAT('%',#{arinvoicesPagination.documentNo},'%')
     </if>

SC-boot/linkage-scm/src/main/resources/mapper/collection/CollectionMapper.xml

@@ -17,15 +17,7 @@
 	    jg_collection a
 	    LEFT JOIN jg_customer b ON a.customer_id = b.id and b.delete_mark = '0'
 	    LEFT JOIN jg_contract c ON a.contract_id = c.id and c.delete_mark = '0'
-	    where 1=1
-        and a.delete_mark = '0'
-        /*添加权限*/
-        <if test="collectionPagination.departmentId != null and collectionPagination.departmentId != ''">
-            AND a.department_id = #{collectionPagination.departmentId}
-        </if>
-        <if test="collectionPagination.orgnizeId != null and collectionPagination.orgnizeId != ''">
-            AND a.orgnize_id = #{collectionPagination.orgnizeId}
-        </if>
+        ${ew.customSqlSegment}
         <if test="collectionPagination.documentNo != null and collectionPagination.documentNo != ''">
             and a.document_no  LIKE CONCAT('%',#{collectionPagination.documentNo},'%')
         </if>

SC-boot/linkage-scm/src/main/resources/mapper/invoices/InvoicesMapper.xml

@@ -7,14 +7,7 @@
         LEFT JOIN jg_purchaseorder b on a.purchaseorder_id = b.id
         LEFT JOIN jg_contract c on a.contract_id = c.id
         LEFT JOIN jg_supplier d on a.supplier_id = d.id
-        where 1=1 AND a.delete_mark = 0 AND b.delete_mark = 0 AND c.delete_mark = 0 AND d.delete_mark = 0
-        /*添加权限*/
-        <if test="invoicesPagination.departmentId != null and invoicesPagination.departmentId != ''">
-            AND a.department_id = #{invoicesPagination.departmentId}
-        </if>
-        <if test="invoicesPagination.orgnizeId != null and invoicesPagination.orgnizeId != ''">
-            AND a.orgnize_id = #{invoicesPagination.orgnizeId}
-        </if>
+        ${ew.customSqlSegment} AND b.delete_mark = 0 AND c.delete_mark = 0 AND d.delete_mark = 0
         <if test="invoicesPagination.startDate != null and invoicesPagination.endDate != null">
             AND a.creator_time &gt; #{invoicesPagination.startDate} AND a.creator_time &lt;= #{invoicesPagination.endDate}
         </if>

SC-boot/linkage-scm/src/main/resources/mapper/poundlist/PoundlistMapper.xml

@@ -74,10 +74,10 @@ WHERE a.delete_mark = 0 and
             AND (b.ticketno LIKE CONCAT('%',#{poundlistPagination.keyword},'%') OR c.supplier_name LIKE CONCAT('%',#{poundlistPagination.keyword},'%') OR d.supplier_nm LIKE CONCAT('%',#{poundlistPagination.keyword},'%'))
         </if>
 		<if test="poundlistPagination.startDate != null and poundlistPagination.endDate != null">
-			AND a.POUND_DATE &gt; #{poundlistPagination.startDate} AND a.POUND_DATE &lt;= #{poundlistPagination.endDate}
+			AND a.pound_date &gt; #{poundlistPagination.startDate} AND a.pound_date &lt;= #{poundlistPagination.endDate}
 		</if>
 		<if test="poundlistPagination.poundlistNo != null and poundlistPagination.poundlistNo != ''">
-			AND a.POUNDLIST_NO LIKE CONCAT('%',#{poundlistPagination.poundlistNo},'%')
+			AND a.poundlist_no LIKE CONCAT('%',#{poundlistPagination.poundlistNo},'%')
 		</if>
 		<if test="poundlistPagination.businessId != null and poundlistPagination.businessId != ''">
 			AND h.F_RealName LIKE CONCAT('%',#{poundlistPagination.businessId},'%')
@@ -100,6 +100,12 @@ WHERE a.delete_mark = 0 and
 		<if test="poundlistPagination.isExpense != null and poundlistPagination.isExpense != ''">
 			AND a.is_expense = #{poundlistPagination.isExpense}
 		</if>
+		<if test="poundlistPagination.purchaseStatus != null and poundlistPagination.purchaseStatus != ''">
+			AND a.purchase_status = #{poundlistPagination.purchaseStatus}
+		</if>
+		<if test="poundlistPagination.salesStatus != null and poundlistPagination.salesStatus != ''">
+			AND a.sales_status = #{poundlistPagination.salesStatus}
+		</if>
 		<if test="poundlistPagination.materialName != null and poundlistPagination.materialName != ''">
 			AND e.item_name LIKE CONCAT('%',#{poundlistPagination.materialName},'%')
 		</if>

SC-boot/linkage-scm/src/main/resources/mapper/purchaseback/PurchasebackMapper.xml

@@ -7,16 +7,7 @@
         LEFT JOIN jg_purchaseorder b on a.purchase_order_id = b.id
         LEFT JOIN jg_contract c on b.contract_code = c.id
         LEFT JOIN jg_supplier d on b.supplier_id = d.id
-        where 1=1 and a.delete_mark = 0 and b.delete_mark = 0 and c.delete_mark = 0 and d.delete_mark = 0
-
-        /*添加权限*/
-        <if test="purchasebackPagination.departmentId != null and purchasebackPagination.departmentId != ''">
-            AND a.department_id = #{purchasebackPagination.departmentId}
-        </if>
-        <if test="purchasebackPagination.orgnizeId != null and purchasebackPagination.orgnizeId != ''">
-            AND a.orgnize_id = #{purchasebackPagination.orgnizeId}
-        </if>
-
+        ${ew.customSqlSegment} and b.delete_mark = 0 and c.delete_mark = 0 and d.delete_mark = 0
         <if test="purchasebackPagination.documentNo != null and purchasebackPagination.documentNo != ''">
             AND a.document_no LIKE CONCAT('%',#{purchasebackPagination.documentNo},'%')
         </if>

SC-boot/linkage-scm/src/main/resources/mapper/receiptout/ReceiptoutMapper.xml

@@ -11,15 +11,7 @@
     jg_receiptout a
     LEFT JOIN jg_customer b on a.customer_id = b.id and b.delete_mark = '0'
     LEFT JOIN jg_salesorder c on a.source_no = c.id and c.delete_mark = '0'
-    where 1=1
-    and a.delete_mark = '0'
-    /*添加权限*/
-    <if test="receiptoutPagination.departmentId != null and receiptoutPagination.departmentId != ''">
-        AND a.department_id = #{receiptoutPagination.departmentId}
-    </if>
-    <if test="receiptoutPagination.orgnizeId != null and receiptoutPagination.orgnizeId != ''">
-        AND a.orgnize_id = #{receiptoutPagination.orgnizeId}
-    </if>
+    ${ew.customSqlSegment}
     <if test="receiptoutPagination.documentNo != null and receiptoutPagination.documentNo != ''">
         and a.document_no  LIKE CONCAT('%',#{receiptoutPagination.documentNo},'%')
     </if>

SC-boot/linkage-scm/src/main/resources/mapper/saleback/SalebackMapper.xml

@@ -12,15 +12,7 @@
         LEFT JOIN jg_salesorder b on a.sales_order_id = b.id and b.delete_mark = '0'
         LEFT JOIN jg_contract c on b.contract_id = c.id and c.delete_mark = '0'
         LEFT JOIN jg_customer d on b.customer_id = d.id and d.delete_mark = '0'
-        where 1 = 1
-        and a.delete_mark = '0'
-        /*添加权限*/
-        <if test="salebackPagination.departmentId != null and salebackPagination.departmentId != ''">
-            AND a.department_id = #{salebackPagination.departmentId}
-        </if>
-        <if test="salebackPagination.orgnizeId != null and salebackPagination.orgnizeId != ''">
-            AND a.orgnize_id = #{salebackPagination.orgnizeId}
-        </if>
+        ${ew.customSqlSegment}
         <if test="salebackPagination.documentNo != null and salebackPagination.documentNo != ''">
             and a.document_no  LIKE CONCAT('%',#{salebackPagination.documentNo},'%')
         </if>

SC-boot/linkage-scm/src/main/resources/mapper/salesorderitem/SaleorderMapper.xml

@@ -11,15 +11,7 @@
     jg_salesorder a
     left join jg_contract b on a.contract_id = b.id  and b.delete_mark = '0'
     left join jg_customer c on a.customer_id = c.id  and c.delete_mark = '0'
-    where 1=1
-    and a.delete_mark = '0'
-    /*添加权限*/
-    <if test="saleorderitemPagination.departmentId != null and saleorderitemPagination.departmentId != ''">
-        AND a.department_id = #{saleorderitemPagination.departmentId}
-    </if>
-    <if test="saleorderitemPagination.orgnizeId != null and saleorderitemPagination.orgnizeId != ''">
-        AND a.orgnize_id = #{saleorderitemPagination.orgnizeId}
-    </if>
+    ${ew.customSqlSegment}
     <if test="saleorderitemPagination.documentNo != null and saleorderitemPagination.documentNo != ''">
         and a.document_no  LIKE CONCAT('%',#{saleorderitemPagination.documentNo},'%')
     </if>

SC-boot/linkage-scm/src/main/resources/mapper/tradeupload/TradeuploadMapper.xml

@@ -26,14 +26,7 @@ creator_time = DATE_SUB(NOW(),interval 15 day)
         LEFT JOIN jg_contract g on a.purchase_id = g.id
         LEFT JOIN base_user h on a.business_id = h.f_id
         LEFT JOIN jg_natural i on a.natural_id = i.id
-        where a.is_examine = '0' AND a.delete_mark = 0
-        /*添加权限*/
-        <if test="tradeuploadPagination.departmentId != null and tradeuploadPagination.departmentId != ''">
-            AND a.department_id = #{tradeuploadPagination.departmentId}
-        </if>
-        <if test="tradeuploadPagination.orgnizeId != null and tradeuploadPagination.orgnizeId != ''">
-            AND a.orgnize_id = #{tradeuploadPagination.orgnizeId}
-        </if>
+        ${ew.customSqlSegment}
         <if test="tradeuploadPagination.keyword != null and tradeuploadPagination.keyword != ''">
             AND (b.ticketno LIKE CONCAT('%',#{tradeuploadPagination.keyword},'%') OR c.supplier_name LIKE CONCAT('%',#{tradeuploadPagination.keyword},'%') OR d.supplier_nm LIKE CONCAT('%',#{tradeuploadPagination.keyword},'%'))
         </if>

SC-web/src/styles/index.scss

@@ -222,8 +222,8 @@ aside {
 
 ::-webkit-scrollbar-track,
 ::-webkit-scrollbar-thumb {
-  border-radius: 999px;
-  border: 5px solid transparent;
+  border-radius: 1px;
+  border: 1px solid transparent;
 }
 
 ::-webkit-scrollbar-track {

SC-web/src/views/scm/basicInformation/areasetting/index.vue

@@ -12,7 +12,7 @@
           <el-col :span="6">
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-              <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+              <el-button icon="el-icon-refresh-right" @click="resetAll()">重置</el-button>
             </el-form-item>
           </el-col>
         </el-form>
@@ -277,6 +277,12 @@
         if (isrRefresh) this.reset()
       },
       reset() {
+        // for (let key in this.query) {
+        //   this.query[key] = undefined
+        // }
+        this.search()
+      },
+      resetAll() {
         for (let key in this.query) {
           this.query[key] = undefined
         }

SC-web/src/views/scm/basicInformation/arinvoices/index.vue

@@ -37,7 +37,7 @@
                     <el-col :span="6">
                         <el-form-item>
                             <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-                            <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+                            <el-button icon="el-icon-refresh-right" @click="resetAll()">重置</el-button>
                             <el-button type="text" icon="el-icon-arrow-down" @click="showAll=true"
                               v-if="!showAll">展开</el-button>
                             <el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>
@@ -313,6 +313,12 @@
                 if (isrRefresh) this.reset()
             },
             reset() {
+                // for (let key in this.query) {
+                //     this.query[key] = undefined
+                // }
+                this.search()
+            },
+            resetAll() {
                 for (let key in this.query) {
                     this.query[key] = undefined
                 }

SC-web/src/views/scm/basicInformation/collection/index.vue

@@ -22,7 +22,7 @@
           <el-col :span="6">
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-              <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+              <el-button icon="el-icon-refresh-right" @click="resetAll()">重置</el-button>
             </el-form-item>
           </el-col>
         </el-form>
@@ -515,6 +515,12 @@
         if (isrRefresh) this.reset()
       },
       reset() {
+        // for (let key in this.query) {
+        //   this.query[key] = undefined
+        // }
+        this.search()
+      },
+      resetAll() {
         for (let key in this.query) {
           this.query[key] = undefined
         }

SC-web/src/views/scm/basicInformation/contractfile/index.vue

@@ -33,7 +33,7 @@
           <el-col :span="6">
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-              <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+              <el-button icon="el-icon-refresh-right" @click="resetAll()">重置</el-button>
               <el-button type="text" icon="el-icon-arrow-down" @click="showAll = true" v-if="!showAll">
                 展开
               </el-button>
@@ -434,6 +434,12 @@
         if (isrRefresh) this.reset()
       },
       reset() {
+        // for (let key in this.query) {
+        //   this.query[key] = undefined
+        // }
+        this.search()
+      },
+      resetAll() {
         for (let key in this.query) {
           this.query[key] = undefined
         }

SC-web/src/views/scm/basicInformation/customer/index.vue

@@ -29,7 +29,7 @@
           <el-col :span="6">
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-              <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+              <el-button icon="el-icon-refresh-right" @click="resetAll()">重置</el-button>
               <el-button type="text" icon="el-icon-arrow-down" @click="showAll=true" v-if="!showAll">
                 展开
               </el-button>
@@ -338,6 +338,12 @@
         if (isrRefresh) this.reset()
       },
       reset() {
+        // for (let key in this.query) {
+        //   this.query[key] = undefined
+        // }
+        this.search()
+      },
+      resetAll() {
         for (let key in this.query) {
           this.query[key] = undefined
         }

SC-web/src/views/scm/basicInformation/inventoryOrd/index.vue

@@ -17,7 +17,7 @@
           <el-col :span="6">
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-              <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+              <el-button icon="el-icon-refresh-right" @click="resetAll()">重置</el-button>
             </el-form-item>
           </el-col>
         </el-form>
@@ -213,6 +213,12 @@
         if (isrRefresh) this.reset()
       },
       reset() {
+        // for (let key in this.query) {
+        //   this.query[key] = undefined
+        // }
+        this.search()
+      },
+      resetAll() {
         for (let key in this.query) {
           this.query[key] = undefined
         }

SC-web/src/views/scm/basicInformation/inventoryOrdDetail/index.vue

@@ -17,7 +17,7 @@
           <el-col :span="6">
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-              <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+              <el-button icon="el-icon-refresh-right" @click="resetAll()">重置</el-button>
             </el-form-item>
           </el-col>
         </el-form>
@@ -213,6 +213,12 @@
         if (isrRefresh) this.reset()
       },
       reset() {
+        // for (let key in this.query) {
+        //   this.query[key] = undefined
+        // }
+        this.search()
+      },
+      resetAll() {
         for (let key in this.query) {
           this.query[key] = undefined
         }

SC-web/src/views/scm/basicInformation/invoices/Form.vue

@@ -592,7 +592,8 @@
             sums[index] = '';
           }
         });
-
+        this.dataForm.invoiceAmount = sums[5];
+        this.dataForm.invoiceQuantity = sums[4];
         return sums;
       },
       invoiceQuantityChange(row) {

SC-web/src/views/scm/basicInformation/invoices/index.vue

@@ -37,7 +37,7 @@
           <el-col :span="6">
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-              <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+              <el-button icon="el-icon-refresh-right" @click="resetAll()">重置</el-button>
               <el-button type="text" icon="el-icon-arrow-down" @click="showAll=true"
                 v-if="!showAll">展开</el-button>
               <el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>
@@ -412,6 +412,12 @@
         if (isrRefresh) this.reset()
       },
       reset() {
+        // for (let key in this.query) {
+        //   this.query[key] = undefined
+        // }
+        this.search()
+      },
+      resetAll() {
         for (let key in this.query) {
           this.query[key] = undefined
         }

SC-web/src/views/scm/basicInformation/jg_contract/index.vue

@@ -17,7 +17,7 @@
           <el-col :span="6">
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-              <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+              <el-button icon="el-icon-refresh-right" @click="resetAll()">重置</el-button>
             </el-form-item>
           </el-col>
         </el-form>
@@ -284,6 +284,12 @@
         if (isrRefresh) this.reset()
       },
       reset() {
+        // for (let key in this.query) {
+        //   this.query[key] = undefined
+        // }
+        this.search()
+      },
+      resetAll() {
         for (let key in this.query) {
           this.query[key] = undefined
         }

SC-web/src/views/scm/basicInformation/jg_supplier/index.vue

@@ -34,7 +34,7 @@
                     <el-col :span="6">
                         <el-form-item>
                             <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-                            <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+                            <el-button icon="el-icon-refresh-right" @click="resetAll()">重置</el-button>
                                 <el-button type="text" icon="el-icon-arrow-down" @click="showAll=true" v-if="!showAll">
                                     展开
                                 </el-button>
@@ -369,6 +369,12 @@ width="150" >
                 if (isrRefresh) this.reset()
             },
             reset() {
+                // for (let key in this.query) {
+                //     this.query[key] = undefined
+                // }
+                this.search()
+            },
+            resetAll() {
                 for (let key in this.query) {
                     this.query[key] = undefined
                 }

SC-web/src/views/scm/basicInformation/material/index.vue

@@ -17,7 +17,7 @@
           <el-col :span="6">
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-              <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+              <el-button icon="el-icon-refresh-right" @click="resetAll()">重置</el-button>
             </el-form-item>
           </el-col>
         </el-form>
@@ -307,6 +307,12 @@
         if (isrRefresh) this.reset()
       },
       reset() {
+        // for (let key in this.query) {
+        //   this.query[key] = undefined
+        // }
+        this.search()
+      },
+      resetAll() {
         for (let key in this.query) {
           this.query[key] = undefined
         }

SC-web/src/views/scm/basicInformation/messagecenter/index.vue

@@ -32,7 +32,7 @@
                     <el-col :span="6">
                         <el-form-item>
                             <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-                            <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+                            <el-button icon="el-icon-refresh-right" @click="resetAll()">重置</el-button>
                             <el-button type="text" icon="el-icon-arrow-down" @click="showAll = true" v-if="!showAll">
                                 展开
                             </el-button>
@@ -236,6 +236,12 @@ export default {
             if (isrRefresh) this.reset()
         },
         reset() {
+            // for (let key in this.query) {
+            //     this.query[key] = undefined
+            // }
+            this.search()
+        },
+        resetAll() {
             for (let key in this.query) {
                 this.query[key] = undefined
             }

SC-web/src/views/scm/basicInformation/monitormanage/index.vue

@@ -22,7 +22,7 @@
           <el-col :span="6">
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-              <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+              <el-button icon="el-icon-refresh-right" @click="resetAll()">重置</el-button>
             </el-form-item>
           </el-col>
         </el-form>
@@ -285,6 +285,12 @@
         if (isrRefresh) this.reset()
       },
       reset() {
+        // for (let key in this.query) {
+        //   this.query[key] = undefined
+        // }
+        this.search()
+      },
+      resetAll() {
         for (let key in this.query) {
           this.query[key] = undefined
         }

SC-web/src/views/scm/basicInformation/natural/index.vue

@@ -29,7 +29,7 @@
                     <el-col :span="6">
                         <el-form-item>
                             <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-                            <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+                            <el-button icon="el-icon-refresh-right" @click="resetAll()">重置</el-button>
                             <el-button type="text" icon="el-icon-arrow-down" @click="showAll = true" v-if="!showAll">
                                 展开
                             </el-button>
@@ -271,6 +271,12 @@ export default {
             if (isrRefresh) this.reset()
         },
         reset() {
+            // for (let key in this.query) {
+            //     this.query[key] = undefined
+            // }
+            this.search()
+        },
+        resetAll() {
             for (let key in this.query) {
                 this.query[key] = undefined
             }

SC-web/src/views/scm/basicInformation/payment/index.vue

@@ -26,7 +26,7 @@
           <el-col :span="6">
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-              <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+              <el-button icon="el-icon-refresh-right" @click="resetAll()">重置</el-button>
             </el-form-item>
           </el-col>
         </el-form>
@@ -513,6 +513,12 @@
         if (isrRefresh) this.reset()
       },
       reset() {
+        // for (let key in this.query) {
+        //   this.query[key] = undefined
+        // }
+        this.search()
+      },
+      resetAll() {
         for (let key in this.query) {
           this.query[key] = undefined
         }

SC-web/src/views/scm/basicInformation/paymentdoc/index.vue

@@ -16,7 +16,7 @@
 					<el-col :span="6">
 						<el-form-item>
 							<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-							<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+							<el-button icon="el-icon-refresh-right" @click="resetAll()">重置</el-button>
 						</el-form-item>
 					</el-col>
 				</el-form>
@@ -534,9 +534,21 @@
 				if (isrRefresh) this.reset()
 			},
 			reset() {
-				for (let key in this.query) {
-					this.query[key] = undefined
+				// for (let key in this.query) {
+				// 	this.query[key] = undefined
+				// }
+				this.listQuery = {
+					currentPage: 1,
+					pageSize: 20,
+					sort: "desc",
+					sidx: "",
 				}
+				this.initData()
+			},
+			resetAll() {
+				// for (let key in this.query) {
+				// 	this.query[key] = undefined
+				// }
 				this.listQuery = {
 					currentPage: 1,
 					pageSize: 20,

SC-web/src/views/scm/basicInformation/poundlist/index.vue

@@ -81,11 +81,25 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="采购状态">
+                <el-select v-model="query.purchaseStatus" placeholder="请选择" clearable :style='{"width":"100%"}'>
+                  <el-option v-for="(item, index) in purchaseStatusOptions" :key="index" :label="item.fullName" :value="item.id" ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="销售状态">
+                <el-select v-model="query.salesStatus" placeholder="请选择" clearable :style='{"width":"100%"}'>
+                  <el-option v-for="(item, index) in salesStatusOptions" :key="index" :label="item.fullName" :value="item.id" ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
           </template>
 					<el-col :span="6">
 						<el-form-item>
 							<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-							<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+							<el-button icon="el-icon-refresh-right" @click="resetAll()">重置</el-button>
               <el-button type="text" icon="el-icon-arrow-down" @click="showAll=true"
                 v-if="!showAll">展开</el-button>
               <el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>
@@ -235,7 +249,7 @@
 						<template slot-scope="scope">
 <!--							<el-button type="text" @click="addOrUpdateHandle(scope.row)" v-has="'btn_edit'">编辑
 							</el-button>-->
-              <el-button type="text" @click="handleReturn(scope.row)" v-has="'btn_remove'">驳回
+              <el-button type="text" @click="handleReturn(scope.row)" v-has="'btn_handleReturn'">驳回
               </el-button>
 							<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row)" v-has="'btn_remove'">删除
 							</el-button>
@@ -776,85 +790,91 @@
         if(row.isInvoicing == '1'){
           var msg = '开进项票';
 
-          this.$message({
-            type: 'error',
-            message: '已' + msg +'无法编辑',
-            duration: 2500
-          });
-          return
-        }
-        id = row.id;
-				this.formVisible = true
-				this.$nextTick(() => {
-					this.$refs.JNPFForm.init(id, false)
-				})
-			},
-      addOvheicle(id,isDetail){
-        this.formVisible6 = true
-        this.$nextTick(() => {
-          this.$refs.JNPFForm6.init(id, isDetail)
-        })
-      },
-			exportData() {
-				this.exportBoxVisible = true
-				this.$nextTick(() => {
-					this.$refs.ExportBox.init(this.columnList)
-				})
-			},
-			download(data) {
-				let query = {
-					...data,
-					...this.listQuery,
-					...this.query,
-					menuId: this.menuId
-				}
-				request({
-					url: `/api/poundlist/Poundlist/Actions/Export`,
-					method: 'GET',
-					data: query
-				}).then(res => {
-					if (!res.data.url) return
-          debugger
-					this.jnpf.downloadFile(res.data.url)
-					this.$refs.ExportBox.visible = false
-					this.exportBoxVisible = false
-				})
-			},
-			search() {
-				this.listQuery = {
-					currentPage: 1,
-					pageSize: 20,
-					sort: "desc",
-					sidx: "",
-				}
-				this.initData()
-			},
-			refresh(isrRefresh) {
-				this.formVisible = false
-				if (isrRefresh) this.reset()
-			},
-      refresh2(isrRefresh) {
-      	this.formVisible2 = false
-      	if (isrRefresh) this.reset()
-      },
-      refresh3(isrRefresh) {
-      	this.formVisible3 = false
-      	if (isrRefresh) this.reset()
-      },
-      refresh4(isrRefresh) {
-      	this.formVisible4 = false
-      	if (isrRefresh) this.reset()
-      },
-      refresh4(isrRefresh) {
-        this.formVisible6 = false
-        if (isrRefresh) this.reset()
-      },
-			reset() {
-				for (let key in this.query) {
-					this.query[key] = undefined
-				}
-				this.search()
-			}
-		}
-	}
+        this.$message({
+          type: "error",
+          message: "已" + msg + "无法编辑",
+          duration: 2500,
+        });
+        return;
+      }
+      id = row.id;
+      this.formVisible = true;
+      this.$nextTick(() => {
+        this.$refs.JNPFForm.init(id, false);
+      });
+    },
+    addOvheicle(id, isDetail) {
+      this.formVisible6 = true;
+      this.$nextTick(() => {
+        this.$refs.JNPFForm6.init(id, isDetail);
+      });
+    },
+    exportData() {
+      this.exportBoxVisible = true;
+      this.$nextTick(() => {
+        this.$refs.ExportBox.init(this.columnList);
+      });
+    },
+    download(data) {
+      let query = {
+        ...data,
+        ...this.listQuery,
+        ...this.query,
+        menuId: this.menuId,
+      };
+      request({
+        url: `/api/poundlist/Poundlist/Actions/Export`,
+        method: "GET",
+        data: query,
+      }).then((res) => {
+        if (!res.data.url) return;
+        debugger;
+        this.jnpf.downloadFile(res.data.url);
+        this.$refs.ExportBox.visible = false;
+        this.exportBoxVisible = false;
+      });
+    },
+    search() {
+      this.listQuery = {
+        currentPage: 1,
+        pageSize: 20,
+        sort: "desc",
+        sidx: "",
+      };
+      this.initData();
+    },
+    refresh(isrRefresh) {
+      this.formVisible = false;
+      if (isrRefresh) this.reset();
+    },
+    refresh2(isrRefresh) {
+      this.formVisible2 = false;
+      if (isrRefresh) this.reset();
+    },
+    refresh3(isrRefresh) {
+      this.formVisible3 = false;
+      if (isrRefresh) this.reset();
+    },
+    refresh4(isrRefresh) {
+      this.formVisible4 = false;
+      if (isrRefresh) this.reset();
+    },
+    refresh4(isrRefresh) {
+      this.formVisible6 = false;
+      if (isrRefresh) this.reset();
+    },
+    reset() {
+    //   for (let key in this.query) {
+    //     this.query[key] = undefined;
+    //   }
+      this.search();
+    },
+	resetAll() {
+      for (let key in this.query) {
+        this.query[key] = undefined;
+      }
+      this.search();
+    },
+  },
+};
 </script>

SC-web/src/views/scm/basicInformation/poundlist/salesForm.vue

@@ -725,7 +725,7 @@
         isDetail: false,
         dataForm: {
           isTransfer: '',
-          purchaseOrderId: '',
+          purchaseOrderId: [],
           documentNo: '',
           contractId: '',
           customerId: '',
@@ -1001,7 +1001,8 @@
         this.dataForm.contractName = list[0].contractName
         this.dataForm.customerName = list[0].customerName
         this.dataForm.isTransfer = list.isTransfer
-        this.dataForm.purchaseOrderId = list .purchaseOrderId
+        this.dataForm.purchaseOrderId = list.purchaseOrderId
+        debugger
         var num = 0
         var amount = 0
         var advance = 0

SC-web/src/views/scm/basicInformation/purchaseback/index.vue

@@ -12,7 +12,7 @@
           <el-col :span="6">
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-              <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+              <el-button icon="el-icon-refresh-right" @click="resetAll()">重置</el-button>
             </el-form-item>
           </el-col>
         </el-form>
@@ -356,6 +356,12 @@
         if (isrRefresh) this.reset()
       },
       reset() {
+        // for (let key in this.query) {
+        //   this.query[key] = undefined
+        // }
+        this.search()
+      },
+      resetAll() {
         for (let key in this.query) {
           this.query[key] = undefined
         }

SC-web/src/views/scm/basicInformation/purchaseorder/InvoicesForm.vue

@@ -557,7 +557,8 @@
             sums[index] = '';
           }
         });
-
+        this.dataForm.invoiceAmount = sums[5];
+        this.dataForm.invoiceQuantity = sums[4];
         return sums;
       },
       invoiceQuantityChange(row){

SC-web/src/views/scm/basicInformation/purchaseorder/index.vue

@@ -39,7 +39,7 @@
           <el-col :span="6">
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-              <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+              <el-button icon="el-icon-refresh-right" @click="resetAll()">重置</el-button>
               <el-button type="text" icon="el-icon-arrow-down" @click="showAll=true"
                 v-if="!showAll">展开</el-button>
               <el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>
@@ -547,14 +547,14 @@
         }).catch(() => {})
       },
       toSaleHandle(){
-        if (!this.multipleSelectionItem.length || this.multipleSelectionItem.length != 1) {
-        	this.$message({
-        		type: 'error',
-        		message: '请选择一条数据',
-        		duration: 2500
-        	})
-        	return
-        }
+        // if (!this.multipleSelectionItem.length || this.multipleSelectionItem.length != 1) {
+        // 	this.$message({
+        // 		type: 'error',
+        // 		message: '请选择一条数据',
+        // 		duration: 2500
+        // 	})
+        // 	return
+        // }
         var flag = true;
         this.multipleSelectionItem.forEach((item,index) => {
           if(item.isTransfer == '1'){
@@ -571,25 +571,31 @@
         }
         console.log('aaaaaaa', this.multipleSelectionItem)
         var ids = '';
-        this.multipleSelectionItem[0].poundlistEntityList.forEach((item, index)=>{
-          ids = ids + item.id + ',';
-        });
+        this.multipleSelectionItem.forEach((item,index) => {
+          item.poundlistEntityList.forEach((item2,index) => {
+            ids = ids + item2.id + ',';
+          })
+        })
+        // this.multipleSelectionItem[0].poundlistEntityList.forEach((item, index)=>{
+        //   ids = ids + item.id + ',';
+        // });
         if(ids.length > 0){
           ids = ids.substring(0, ids.length - 1);
         }
-        debugger
         request({
           url: `/api/poundlist/Poundlist/createsale/${ids}`,
           method: 'post'
         }).then(res => {
+          var purchaseIds = '';
+          this.multipleSelectionItem.forEach((item,index) => {
+            purchaseIds = purchaseIds + item.id + ',';
+          })
           var list = []
           for (let i = 0; i < res.data.length; i++) {
-            // res.data[i].isTransfer = '1'
-            // res.data[i].purchaseOrderId = this.multipleSelectionItem[0].id
             let _data = res.data[i]
-            _data.isTransfer = '1'
-            _data.purchaseOrderId = this.multipleSelectionItem[0].id
             list.push(_data)
+            list.purchaseOrderId = purchaseIds
+            list.isTransfer = '1'
           }
           if (list.length>0) {
             this.formVisible6 = true
@@ -908,6 +914,12 @@
         if (isrRefresh) this.reset()
       },
       reset() {
+        // for (let key in this.query) {
+        //   this.query[key] = undefined
+        // }
+        this.search()
+      },
+      resetAll() {
         for (let key in this.query) {
           this.query[key] = undefined
         }

SC-web/src/views/scm/basicInformation/receiptin/index.vue

@@ -40,7 +40,7 @@
           <el-col :span="6">
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-              <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+              <el-button icon="el-icon-refresh-right" @click="resetAll()">重置</el-button>
               <el-button type="text" icon="el-icon-arrow-down" @click="showAll=true"
                 v-if="!showAll">展开</el-button>
               <el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>
@@ -409,6 +409,12 @@
         if (isrRefresh) this.reset()
       },
       reset() {
+        // for (let key in this.query) {
+        //   this.query[key] = undefined
+        // }
+        this.search()
+      },
+      resetAll() {
         for (let key in this.query) {
           this.query[key] = undefined
         }

SC-web/src/views/scm/basicInformation/receiptout/index.vue

@@ -42,7 +42,7 @@
             <el-col :span="6">
               <el-form-item>
                 <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-                <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+                <el-button icon="el-icon-refresh-right" @click="resetAll()">重置</el-button>
                 <el-button type="text" icon="el-icon-arrow-down" @click="showAll=true"
                   v-if="!showAll">展开</el-button>
                 <el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>
@@ -329,6 +329,12 @@
         if (isrRefresh) this.reset()
       },
       reset() {
+        // for (let key in this.query) {
+        //   this.query[key] = undefined
+        // }
+        this.search()
+      },
+      resetAll() {
         for (let key in this.query) {
           this.query[key] = undefined
         }

SC-web/src/views/scm/basicInformation/reservoirarea/index.vue

@@ -17,7 +17,7 @@
           <el-col :span="6">
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-              <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+              <el-button icon="el-icon-refresh-right" @click="resetAll()">重置</el-button>
             </el-form-item>
           </el-col>
         </el-form>
@@ -267,6 +267,12 @@
         if (isrRefresh) this.reset()
       },
       reset() {
+        // for (let key in this.query) {
+        //   this.query[key] = undefined
+        // }
+        this.search()
+      },
+      resetAll() {
         for (let key in this.query) {
           this.query[key] = undefined
         }

SC-web/src/views/scm/basicInformation/saleback/index.vue

@@ -35,7 +35,7 @@
           <el-col :span="6">
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-              <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+              <el-button icon="el-icon-refresh-right" @click="resetAll()">重置</el-button>
             </el-form-item>
           </el-col>
         </el-form>
@@ -317,6 +317,12 @@
         if (isrRefresh) this.reset()
       },
       reset() {
+        // for (let key in this.query) {
+        //   this.query[key] = undefined
+        // }
+        this.search()
+      },
+      resetAll() {
         for (let key in this.query) {
           this.query[key] = undefined
         }

SC-web/src/views/scm/basicInformation/saleorder/index.vue

@@ -42,7 +42,7 @@
           <el-col :span="6">
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-              <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+              <el-button icon="el-icon-refresh-right" @click="resetAll()">重置</el-button>
               <el-button type="text" icon="el-icon-arrow-down" @click="showAll=true"
                 v-if="!showAll">展开</el-button>
               <el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>
@@ -600,6 +600,12 @@
         if (isrRefresh) this.reset()
       },
       reset() {
+        // for (let key in this.query) {
+        //   this.query[key] = undefined
+        // }
+        this.search()
+      },
+      resetAll() {
         for (let key in this.query) {
           this.query[key] = undefined
         }

SC-web/src/views/scm/basicInformation/supplier/index.vue

@@ -34,7 +34,7 @@
           <el-col :span="6">
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-              <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+              <el-button icon="el-icon-refresh-right" @click="resetAll()">重置</el-button>
               <el-button type="text" icon="el-icon-arrow-down" @click="showAll = true" v-if="!showAll">
                 展开
               </el-button>
@@ -374,6 +374,12 @@ export default {
       if (isrRefresh) this.reset()
     },
     reset() {
+      // for (let key in this.query) {
+      //   this.query[key] = undefined
+      // }
+      this.search()
+    },
+    resetAll() {
       for (let key in this.query) {
         this.query[key] = undefined
       }

SC-web/src/views/scm/basicInformation/tradeupload/Form.vue

@@ -8,7 +8,7 @@
 					<el-col :span="12">
 						<el-form-item label="磅单上传" prop="poundPictures">
 							<JNPF-UploadImg2B v-model="dataForm.poundPictures" :fileSize="500" sizeUnit="MB" :limit="1"
-								@change="imgChange" ref="poundUpload" >
+								@change="imgChange" ref="poundUpload">
 
 							</JNPF-UploadImg2B>
 						</el-form-item>
@@ -25,7 +25,7 @@
 							<popupSelect v-model="dataForm.materialId" placeholder="请选择物料编码" clearable
 								field="materialId" interfaceId="381037852907038533"
 								:columnOptions="materialIdcolumnOptions" propsValue="id" relationField="item_name"
-								popupType="dialog" popupTitle="选择数据" popupWidth="800px" hasPage :pageSize="20" >
+								popupType="dialog" popupTitle="选择数据" popupWidth="800px" hasPage :pageSize="20">
 
 							</popupSelect>
 						</el-form-item>
@@ -35,7 +35,7 @@
 							<popupSelect v-model="dataForm.customerId" placeholder="请选择客户" clearable field="customerId"
 								interfaceId="395936123471343749" :columnOptions="customerIdcolumnOptions"
 								propsValue="id" relationField="supplier_nm" popupType="dialog" popupTitle="选择数据"
-								popupWidth="800px" hasPage :pageSize="20" @change="customerSelect" >
+								popupWidth="800px" hasPage :pageSize="20" @change="customerSelect">
 
 							</popupSelect>
 						</el-form-item>
@@ -50,31 +50,6 @@
 							</popupSelect>
 						</el-form-item>
 					</el-col>
-          <el-col :span="6">
-            <el-form-item label="采购合同" prop="purchaseId">
-              <popupSelect v-model="dataForm.purchaseId" placeholder="请选择合同" clearable field="purchaseId"
-                           interfaceId="397408984857931205" :columnOptions="salesIdcolumnOptions" propsValue="id"
-                           relationField="contract_name" popupType="dialog" popupTitle="选择数据" popupWidth="800px"
-                           hasPage :pageSize="20"  disabled>
-
-              </popupSelect>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="供应商" prop="supplierId">
-              <popupSelect v-model="dataForm.supplierId" placeholder="请选择客户" clearable field="supplierId"
-                           interfaceId="382494924156735557" :columnOptions="supplierIdcolumnOptions" propsValue="id"
-                           relationField="supplier_name" popupType="dialog" popupTitle="选择数据" popupWidth="800px" hasPage
-                           :pageSize="20" disabled>
-
-              </popupSelect>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="采购价格" prop="purchasePrice" disabled="">
-              <el-input-number v-model="dataForm.purchasePrice" :style='{"width":"100%"}' :precision="6" disabled></el-input-number>
-            </el-form-item>
-          </el-col>
 					<el-col :span="6">
 						<el-form-item label="车牌号" prop="vehicleId">
 							<popupSelect v-model="dataForm.vehicleId" placeholder="请选择车辆" clearable field="vehicleId"
@@ -202,7 +177,7 @@
 						</el-form-item>
 					</el-col>
 
-					<el-col :span="12">
+					<el-col :span="6">
 						<el-form-item label="备注" prop="remark">
 							<el-input v-model="dataForm.remark" placeholder="请输入备注信息" clearable
 								:style='{"width":"100%"}'>
@@ -451,13 +426,7 @@
 					"label": "业务员2地址",
 					"value": "adress"
 				}, ],
-        supplierIdcolumnOptions: [{
-          "label": "供应商编码",
-          "value": "supplier_code"
-        }, {
-          "label": "供应商名称",
-          "value": "supplier_name"
-        }],
+
 			}
 		},
 		computed: {},
@@ -602,104 +571,20 @@
 							this.dataInfo(res.data)
 							this.dataForm.businessId = this.$store.state.user.userInfo.userId;
 							this.dataForm.businessName = this.$store.state.user.userInfo.userName;
-							this.dataForm.poundDate = new Date().getTime();
+							this.dataForm.poundDate = new Date();
 							this.loading = false
 						});
 					} else {
 						this.clearData(this.dataForm)
 						this.dataForm.businessId = this.$store.state.user.userInfo.userId;
 						this.dataForm.businessName = this.$store.state.user.userInfo.userName;
-						this.dataForm.poundDate = new Date().getTime();
+						this.dataForm.poundDate = new Date();
 					}
 				});
 				this.$store.commit('generator/UPDATE_RELATION_DATA', {})
 			},
 			// 表单提交
-      dataFormSubmit() {
-        var tareWeight = this.dataForm.tareWeight;//皮重
-        var grossWeight = this.dataForm.grossWeight;//毛重
-        var buckleWeight = this.dataForm.buckleWeight;//扣重
-        var netWeight = this.dataForm.netWeight;//净重
-        this.dataForm.unit = this.dataForm.unit ? this.dataForm.unit : 0;
-        this.dataForm.transportType = this.dataForm.transportType ? this.dataForm.transportType : 0;
-        this.dataForm.advance = this.dataForm.advance ? this.dataForm.advance : 0;
-        if(grossWeight < tareWeight + buckleWeight + netWeight){
-          this.$message({
-            message: '毛重不得小于皮重+扣重+净重',
-            type: 'success',
-            duration: 1000
-          })
-          return
-        }
-        if(buckleWeight >= netWeight){
-          this.$message({
-            message: '扣重不得大于净重',
-            type: 'success',
-            duration: 1000
-          })
-          return
-        }
-        if(buckleWeight >= grossWeight){
-          this.$message({
-            message: '扣重不得大于毛重',
-            type: 'success',
-            duration: 1000
-          })
-          return
-        }
-        this.$refs['elForm'].validate((valid) => {
-          if (valid) {
-            this.request2()
-          }
-        })
-      },
-      request2() {
-        this.submitDisabled = true;
-        this.dataForm;
-        var _data = this.dataList()
-        debugger
-        if (!this.dataForm.id) {
-          request({
-            url: '/api/tradeupload/Tradeupload',
-            method: 'post',
-            data: _data
-          }).then((res) => {
-            this.$message({
-              message: res.msg,
-              type: 'success',
-              duration: 3000,
-              onClose: () => {
-                this.submitDisabled = false;
-                this.visible = false
-                this.$emit('refresh', true)
-              }
-            })
-          }).catch(() => {
-            this.submitDisabled = false
-          })
-        } else {
-          debugger
-          request({
-            url: '/api/tradeupload/Tradeupload/' + this.dataForm.id,
-            method: 'PUT',
-            data: _data
-          }).then((res) => {
-            this.$message({
-              message: res.msg,
-              type: 'success',
-              duration: 3000,
-              onClose: () => {
-                this.submitDisabled = false;
-                this.visible = false
-                this.$emit('refresh', true)
-              }
-            })
-          }).catch(() => {
-            this.submitDisabled = false
-          })
-        }
-      },
-/*			dataFormSubmit() {
+			dataFormSubmit() {
 				var tareWeight = this.dataForm.tareWeight; //皮重
 				var grossWeight = this.dataForm.grossWeight; //毛重
 				var buckleWeight = this.dataForm.buckleWeight; //扣重
@@ -763,7 +648,7 @@
             this.submitDisabled = false
           })
 				}
-			},*/
+			},
 			request3() {
         this.submitDisabled = true;
 				var _data = this.dataList()

SC-web/src/views/scm/basicInformation/tradeupload/Form3.vue

@@ -604,6 +604,7 @@
 							this.dataForm.businessName = this.$store.state.user.userInfo.userName;
 							this.dataForm.poundDate = new Date().getTime();
 							this.loading = false
+              debugger
 						});
 					} else {
 						this.clearData(this.dataForm)

SC-web/src/views/scm/basicInformation/tradeupload/index.vue

@@ -47,7 +47,7 @@
           <el-col :span="6">
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-              <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+              <el-button icon="el-icon-refresh-right" @click="resetAll()">重置</el-button>
               <el-button type="text" icon="el-icon-arrow-down" @click="showAll=true"
                 v-if="!showAll">展开</el-button>
               <el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>
@@ -155,13 +155,13 @@
                            width="200">
             <template slot-scope="scope">
               <el-button type="text"
-                         @click="continueUpload(scope.row.id)" v-has="'btn_continueUpload'">继续上传
+                         @click="continueUpload(scope.row.id)" v-has="'btn_submitDisabled'">继续上传
               </el-button>
               <el-button type="text"
                          @click="addOrUpdateHandle2(scope.row.id)" v-has="'btn_addOrUpdateHandle2'">审核
               </el-button>
                <el-button type="text"
-                         @click="addOrUpdateHandle(scope.row.id)">编辑
+                         @click="addOrUpdateHandle(scope.row.id)" v-has="'btn_edit'">编辑
               </el-button>
               <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)" v-has="'btn_remove'">删除
               </el-button>
@@ -407,6 +407,12 @@
         this.formVisible2 = false
         if (isrRefresh) this.reset()
       },
+      reset() {
+        // for (let key in this.query) {
+        //   this.query[key] = undefined
+        // }
+        this.search()
+      },
       reset() {
         for (let key in this.query) {
           this.query[key] = undefined

SC-web/src/views/scm/basicInformation/vehicle/index.vue

@@ -17,7 +17,7 @@
           <el-col :span="6">
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-              <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+              <el-button icon="el-icon-refresh-right" @click="resetAll()">重置</el-button>
             </el-form-item>
           </el-col>
         </el-form>
@@ -294,6 +294,12 @@
         if (isrRefresh) this.reset()
       },
       reset() {
+        // for (let key in this.query) {
+        //   this.query[key] = undefined
+        // }
+        this.search()
+      },
+      resetAll() {
         for (let key in this.query) {
           this.query[key] = undefined
         }

SC-web/src/views/scm/basicInformation/warehouse/index.vue

@@ -17,7 +17,7 @@
           <el-col :span="6">
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-              <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+              <el-button icon="el-icon-refresh-right" @click="resetAll()">重置</el-button>
             </el-form-item>
           </el-col>
         </el-form>
@@ -289,6 +289,12 @@
           this.query[key] = undefined
         }
         this.search()
+      },
+      resetAll() {
+        for (let key in this.query) {
+          this.query[key] = undefined
+        }
+        this.search()
       }
     }
   }