Merge branch 'main' of http://222.71.165.188:3000/linkage/SC-MOM

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java

@@ -6,6 +6,7 @@ import cn.afterturn.easypoi.excel.entity.ExportParams;
 import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
 import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import io.minio.Result;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import jnpf.base.ActionResult;
@@ -471,7 +472,18 @@ public class PoundlistController {
         return ActionResult.success("删除成功");
     }
 
-
+    /**
+     * 销售毛利表
+     *
+     * @param
+     * @return
+     */
+    @ApiOperation("销售毛利表")
+    @PostMapping("/qureypoundlist")
+    public ActionResult qureypoundlist(PoundlistSEntity poundlistSEntity){
+        List list=poundlistService.qureylist(poundlistSEntity);
+        return ActionResult.success(list);
+    }
 
 
 

SC-boot/linkage-scm/src/main/java/jnpf/poundlist/entity/PoundlistSEntity.java

@@ -1,21 +1,12 @@
 package jnpf.poundlist.entity;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
-import java.util.Date;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
 import java.math.BigDecimal;
-import java.math.BigDecimal;
+import java.util.Date;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonProperty;
 
 
 /**
@@ -28,7 +19,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  */
 @Data
 @TableName("jg_poundlist")
-public class PoundlistEntity  {
+public class PoundlistSEntity {
 
     @TableId("ID")
     private String id;
@@ -40,7 +31,7 @@ public class PoundlistEntity  {
     private String creatorUserName;
 
     @TableField("CREATOR_TIME")
-    private Date creatorTime;
+    private String creatorTime;
 
     @TableField("LAST_MODIFY_USER_ID")
     private String lastModifyUserId;
@@ -49,7 +40,7 @@ public class PoundlistEntity  {
     private String lastModifyUserName;
 
     @TableField("LAST_MODIFY_TIME")
-    private Date lastModifyTime;
+    private String lastModifyTime;
 
     @TableField("DELETE_USER_ID")
     private String deleteUserId;
@@ -58,7 +49,7 @@ public class PoundlistEntity  {
     private String deleteUserName;
 
     @TableField("DELETE_TIME")
-    private Date deleteTime;
+    private String deleteTime;
 
     @TableField("DELETE_MARK")
     private String deleteMark;
@@ -115,19 +106,19 @@ public class PoundlistEntity  {
     private BigDecimal salesPrice;
 
     @TableField("INPUT_DATE")
-    private Date inputDate;
+    private String inputDate;
 
     @TableField("OUTPUT_DATE")
-    private Date outputDate;
+    private String outputDate;
 
     @TableField("PAY_DATE")
-    private Date payDate;
+    private String payDate;
 
     @TableField("PAYMENT_DATE")
-    private Date paymentDate;
+    private String paymentDate;
 
     @TableField("POUND_DATE")
-    private Date poundDate;
+    private String poundDate;
 
     @TableField("BUSINESS_ID")
     private String businessId;
@@ -168,22 +159,22 @@ public class PoundlistEntity  {
     @TableField("POUNDLIST_NO")
     private String poundlistNo;
 
-    @TableField("VEHICLE_ID")
+    @TableField(exist = false)
     private String vehicleId;
 
-    @TableField("IS_EXAMINE")
+    @TableField(exist = false)
     private String isExamine;
 
-    @TableField("IS_INVOICING")
+    @TableField(exist = false)
     private String isInvoicing;
 
-    @TableField("IS_PAY")
+    @TableField(exist = false)
     private String isPay;
 
-    @TableField("IS_COLLECTION")
+    @TableField(exist = false)
     private String isCollection;
 
-    @TableField("IS_EXPENSE")
+    @TableField(exist = false)
     private String isExpense;
 
     @TableField(exist = false)
@@ -206,4 +197,41 @@ public class PoundlistEntity  {
 
     @TableField(exist = false)
     private String purchaseName;
+    //不含税采购单价
+    @TableField(exist = false)
+    private String noPurchasePrice;
+    //不含税采购单价
+    @TableField(exist = false)
+    private String noSalesPrice;
+
+    @TableField(exist = false)
+    private String notPrice;
+    //销售成本
+    @TableField(exist = false)
+    private String settlementa;
+
+    @TableField(exist = false)
+    private String grossProfit;
+
+    @TableField(exist = false)
+    private String Discount;
+
+    @TableField(exist = false)
+    private String settlements;
+
+    @TableField(exist = false)
+    private String rate;
+
+    @TableField(exist = false)
+    private String startTime;
+
+    @TableField(exist = false)
+    private String endTime;
+
+    @TableField(exist = false)
+    private String departmentIdS;
+
+    @TableField(exist = false)
+    private String supplierNm;
+
 }

SC-boot/linkage-scm/src/main/java/jnpf/poundlist/mapper/PoundlistMapper.java

@@ -5,8 +5,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import jnpf.poundlist.entity.PoundlistEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import jnpf.poundlist.entity.PoundlistSEntity;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  *
  * poundlist
@@ -18,4 +21,6 @@ import org.apache.ibatis.annotations.Param;
 public interface PoundlistMapper extends BaseMapper<PoundlistEntity> {
 
     IPage<PoundlistEntity> queryByKeyword(@Param("page") Page<PoundlistEntity> page, @Param("keyword") String keyword);
+
+    List<PoundlistSEntity> qureylist(PoundlistSEntity poundlistSEntity);
 }

SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/PoundlistService.java

@@ -2,6 +2,7 @@ package jnpf.poundlist.service;
 
 import jnpf.poundlist.entity.PoundlistEntity;
 import com.baomidou.mybatisplus.extension.service.IService;
+import jnpf.poundlist.entity.PoundlistSEntity;
 import jnpf.poundlist.model.poundlist.PoundlistPagination;
 import java.util.*;
 /**
@@ -28,6 +29,8 @@ public interface PoundlistService extends IService<PoundlistEntity> {
 
     boolean update( String id, PoundlistEntity entity);
 
+    List<PoundlistSEntity> qureylist(PoundlistSEntity poundlistSEntity);
+    
 //  子表方法
 
     //列表子表数据方法

SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/impl/PoundlistServiceImpl.java

@@ -1,5 +1,6 @@
 package jnpf.poundlist.service.impl;
 
+import jnpf.contractfile.model.contractfile.ContractFileModel;
 import jnpf.poundlist.entity.*;
 import jnpf.poundlist.mapper.PoundlistMapper;
 import jnpf.poundlist.service.*;
@@ -76,7 +77,6 @@ public class PoundlistServiceImpl extends ServiceImpl<PoundlistMapper, Poundlist
             }
         }
     }
-<<<<<<< HEAD
     if(!isPc && appPermission){
 		if (!userProvider.get().getIsAdministrator()){
 			Object poundlistObj=authorizeService.getCondition(new AuthorizeConditionModel(poundlistQueryWrapper,poundlistPagination.getMenuId(),"jg_poundlist"));
@@ -90,13 +90,12 @@ public class PoundlistServiceImpl extends ServiceImpl<PoundlistMapper, Poundlist
 
 		}
     }
-=======
+
     /*if(!isPc){
         Page<PoundlistEntity> page=new Page<>(poundlistPagination.getCurrentPage(), poundlistPagination.getPageSize());
         IPage<PoundlistEntity> poundlistEntityIPage = poundlistMapper.queryByKeyword(page, poundlistPagination.getKeyword());
         return poundlistPagination.setData(poundlistEntityIPage.getRecords(),poundlistEntityIPage.getTotal());
     }*/
->>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
 			if(StringUtil.isNotEmpty(poundlistPagination.getPoundDate())){
             poundlistNum++;
             List<String> PoundDateList =  poundlistPagination.getPoundDate();
@@ -238,6 +237,14 @@ public class PoundlistServiceImpl extends ServiceImpl<PoundlistMapper, Poundlist
         entity.setId(id);
         return this.updateById(entity);
     }
+
+    //销售毛利表
+    @Override
+    public List<PoundlistSEntity> qureylist(PoundlistSEntity poundlistSEntity) {
+      List<PoundlistSEntity> list=  poundlistMapper.qureylist(poundlistSEntity);
+      return list;
+    }
+
     @Override
     public void delete(PoundlistEntity entity){
         if(entity!=null){

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

@@ -66,48 +66,31 @@ public class SalebackServiceImpl extends ServiceImpl<SalebackMapper, SalebackEnt
         QueryWrapper<SalebackEntity> salebackQueryWrapper=new QueryWrapper<>();
 		int saleback_item0Num =0;
         QueryWrapper<Saleback_item0Entity> saleback_item0QueryWrapper=new QueryWrapper<>();
-<<<<<<< HEAD
-		int saleorderNum =0;
-        QueryWrapper<SaleorderEntity> saleorderQueryWrapper=new QueryWrapper<>();
-    boolean pcPermission = true;
-    boolean appPermission = true;
-=======
 
     boolean pcPermission = false;
     boolean appPermission = false;
->>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
     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.getCondition(new AuthorizeConditionModel(salebackQueryWrapper,salebackPagination.getMenuId(),"saleback"));
             if (ObjectUtil.isEmpty(salebackObj)){
                 return new ArrayList<>();
             } else {
                 salebackQueryWrapper = (QueryWrapper<SalebackEntity>)salebackObj;
                 salebackNum++;
             }
-				Object saleback_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(saleback_item0QueryWrapper,salebackPagination.getMenuId(),"jg_saleback_item0"));
+				Object saleback_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(saleback_item0QueryWrapper,salebackPagination.getMenuId(),"saleback_item0"));
             if (ObjectUtil.isEmpty(saleback_item0Obj)){
                 return new ArrayList<>();
             } else {
                 saleback_item0QueryWrapper = (QueryWrapper<Saleback_item0Entity>)saleback_item0Obj;
                 saleback_item0Num++;
             }
-<<<<<<< HEAD
-				Object saleorderObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderQueryWrapper,salebackPagination.getMenuId(),"jg_saleorder"));
-            if (ObjectUtil.isEmpty(saleorderObj)){
-                return new ArrayList<>();
-            } else {
-                saleorderQueryWrapper = (QueryWrapper<SaleorderEntity>)saleorderObj;
-                saleorderNum++;
-            }
-=======
->>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
         }
     }
     if(!isPc && appPermission){
 		if (!userProvider.get().getIsAdministrator()){
-			Object salebackObj=authorizeService.getCondition(new AuthorizeConditionModel(salebackQueryWrapper,salebackPagination.getMenuId(),"jg_saleback"));
+			Object salebackObj=authorizeService.getCondition(new AuthorizeConditionModel(salebackQueryWrapper,salebackPagination.getMenuId(),"saleback"));
             if (ObjectUtil.isEmpty(salebackObj)){
                 return new ArrayList<>();
             } else {
@@ -116,7 +99,7 @@ public class SalebackServiceImpl extends ServiceImpl<SalebackMapper, SalebackEnt
 			}
 
 
-			Object saleback_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(saleback_item0QueryWrapper,salebackPagination.getMenuId(),"jg_saleback_item0"));
+			Object saleback_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(saleback_item0QueryWrapper,salebackPagination.getMenuId(),"saleback_item0"));
             if (ObjectUtil.isEmpty(saleback_item0Obj)){
                 return new ArrayList<>();
             } else {
@@ -125,17 +108,6 @@ public class SalebackServiceImpl extends ServiceImpl<SalebackMapper, SalebackEnt
 			}
 
 
-<<<<<<< HEAD
-			Object saleorderObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderQueryWrapper,salebackPagination.getMenuId(),"jg_saleorder"));
-            if (ObjectUtil.isEmpty(saleorderObj)){
-                return new ArrayList<>();
-            } else {
-            saleorderQueryWrapper = (QueryWrapper<SaleorderEntity>)saleorderObj;
-             saleorderNum++;
-			}
-
-=======
->>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
 
 		}
     }
@@ -180,49 +152,32 @@ public class SalebackServiceImpl extends ServiceImpl<SalebackMapper, SalebackEnt
         QueryWrapper<SalebackEntity> salebackQueryWrapper=new QueryWrapper<>();
 		int saleback_item0Num =0;
         QueryWrapper<Saleback_item0Entity> saleback_item0QueryWrapper=new QueryWrapper<>();
-<<<<<<< HEAD
-		int saleorderNum =0;
-        QueryWrapper<SaleorderEntity> saleorderQueryWrapper=new QueryWrapper<>();
-    boolean pcPermission = true;
-    boolean appPermission = true;
-=======
 
     boolean pcPermission = false;
     boolean appPermission = false;
->>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
     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.getCondition(new AuthorizeConditionModel(salebackQueryWrapper,salebackPagination.getMenuId(),"saleback"));
             if (ObjectUtil.isEmpty(salebackObj)){
                 return new ArrayList<>();
             } else {
                 salebackQueryWrapper = (QueryWrapper<SalebackEntity>)salebackObj;
                 salebackNum++;
             }
-				Object saleback_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(saleback_item0QueryWrapper,salebackPagination.getMenuId(),"jg_saleback_item0"));
+				Object saleback_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(saleback_item0QueryWrapper,salebackPagination.getMenuId(),"saleback_item0"));
             if (ObjectUtil.isEmpty(saleback_item0Obj)){
                 return new ArrayList<>();
             } else {
                 saleback_item0QueryWrapper = (QueryWrapper<Saleback_item0Entity>)saleback_item0Obj;
                 saleback_item0Num++;
             }
-<<<<<<< HEAD
-				Object saleorderObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderQueryWrapper,salebackPagination.getMenuId(),"jg_saleorder"));
-            if (ObjectUtil.isEmpty(saleorderObj)){
-                return new ArrayList<>();
-            } else {
-                saleorderQueryWrapper = (QueryWrapper<SaleorderEntity>)saleorderObj;
-                saleorderNum++;
-            }
-=======
 
->>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
         }
     }
     if(!isPc && appPermission){
 		if (!userProvider.get().getIsAdministrator()){
-			Object salebackObj=authorizeService.getCondition(new AuthorizeConditionModel(salebackQueryWrapper,salebackPagination.getMenuId(),"jg_saleback"));
+			Object salebackObj=authorizeService.getCondition(new AuthorizeConditionModel(salebackQueryWrapper,salebackPagination.getMenuId(),"saleback"));
             if (ObjectUtil.isEmpty(salebackObj)){
                 return new ArrayList<>();
             } else {
@@ -231,7 +186,7 @@ public class SalebackServiceImpl extends ServiceImpl<SalebackMapper, SalebackEnt
 			}
 
 
-			Object saleback_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(saleback_item0QueryWrapper,salebackPagination.getMenuId(),"jg_saleback_item0"));
+			Object saleback_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(saleback_item0QueryWrapper,salebackPagination.getMenuId(),"saleback_item0"));
             if (ObjectUtil.isEmpty(saleback_item0Obj)){
                 return new ArrayList<>();
             } else {
@@ -240,17 +195,7 @@ public class SalebackServiceImpl extends ServiceImpl<SalebackMapper, SalebackEnt
 			}
 
 
-<<<<<<< HEAD
-			Object saleorderObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderQueryWrapper,salebackPagination.getMenuId(),"jg_saleorder"));
-            if (ObjectUtil.isEmpty(saleorderObj)){
-                return new ArrayList<>();
-            } else {
-            saleorderQueryWrapper = (QueryWrapper<SaleorderEntity>)saleorderObj;
-             saleorderNum++;
-			}
-=======
 
->>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
 
 
 		}

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

@@ -95,83 +95,54 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
         QueryWrapper<PaymentsoitemEntity> paymentsoitemQueryWrapper=new QueryWrapper<>();
 		int arinvoices_item0soitemNum =0;
         QueryWrapper<Arinvoices_item0soitemEntity> arinvoices_item0soitemQueryWrapper=new QueryWrapper<>();
-    boolean pcPermission = true;
+    boolean pcPermission = false;
-    boolean appPermission = true;
+    boolean appPermission = false;
     boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
     if(isPc && pcPermission){
 		if (!userProvider.get().getIsAdministrator()){
-<<<<<<< HEAD
-				Object saleorderObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderQueryWrapper,saleorderPagination.getMenuId(),"jg_saleorder"));
-            if (ObjectUtil.isEmpty(saleorderObj)){
-=======
 				Object saleorderitemObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderitemQueryWrapper,saleorderitemPagination.getMenuId(),"saleorderitem"));
             if (ObjectUtil.isEmpty(saleorderitemObj)){
->>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
                 return new ArrayList<>();
             } else {
                 saleorderitemQueryWrapper = (QueryWrapper<SaleorderitemEntity>)saleorderitemObj;
                 saleorderitemNum++;
             }
-<<<<<<< HEAD
-				Object salesorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(salesorder_item0QueryWrapper,saleorderPagination.getMenuId(),"jg_salesorder_item0"));
-=======
 				Object salesorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(salesorder_item0QueryWrapper,saleorderitemPagination.getMenuId(),"salesorder_item0"));
->>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
             if (ObjectUtil.isEmpty(salesorder_item0Obj)){
                 return new ArrayList<>();
             } else {
                 salesorder_item0QueryWrapper = (QueryWrapper<Salesorder_item0Entity>)salesorder_item0Obj;
                 salesorder_item0Num++;
             }
-<<<<<<< HEAD
-				Object receiptoutsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutsoitemQueryWrapper,saleorderPagination.getMenuId(),"jg_receiptoutsoitem"));
-=======
 				Object receiptoutsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutsoitemQueryWrapper,saleorderitemPagination.getMenuId(),"receiptoutsoitem"));
->>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
             if (ObjectUtil.isEmpty(receiptoutsoitemObj)){
                 return new ArrayList<>();
             } else {
                 receiptoutsoitemQueryWrapper = (QueryWrapper<ReceiptoutsoitemEntity>)receiptoutsoitemObj;
                 receiptoutsoitemNum++;
             }
-<<<<<<< HEAD
-				Object collectionsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionsoitemQueryWrapper,saleorderPagination.getMenuId(),"jg_collectionsoitem"));
-=======
 				Object collectionsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionsoitemQueryWrapper,saleorderitemPagination.getMenuId(),"collectionsoitem"));
->>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
             if (ObjectUtil.isEmpty(collectionsoitemObj)){
                 return new ArrayList<>();
             } else {
                 collectionsoitemQueryWrapper = (QueryWrapper<CollectionsoitemEntity>)collectionsoitemObj;
                 collectionsoitemNum++;
             }
-<<<<<<< HEAD
-				Object salesbacksoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(salesbacksoitemQueryWrapper,saleorderPagination.getMenuId(),"jg_salesbacksoitem"));
-=======
 				Object salesbacksoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(salesbacksoitemQueryWrapper,saleorderitemPagination.getMenuId(),"salesbacksoitem"));
->>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
             if (ObjectUtil.isEmpty(salesbacksoitemObj)){
                 return new ArrayList<>();
             } else {
                 salesbacksoitemQueryWrapper = (QueryWrapper<SalesbacksoitemEntity>)salesbacksoitemObj;
                 salesbacksoitemNum++;
             }
-<<<<<<< HEAD
-				Object paymentsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentsoitemQueryWrapper,saleorderPagination.getMenuId(),"jg_paymentsoitem"));
-=======
 				Object paymentsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentsoitemQueryWrapper,saleorderitemPagination.getMenuId(),"paymentsoitem"));
->>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
             if (ObjectUtil.isEmpty(paymentsoitemObj)){
                 return new ArrayList<>();
             } else {
                 paymentsoitemQueryWrapper = (QueryWrapper<PaymentsoitemEntity>)paymentsoitemObj;
                 paymentsoitemNum++;
             }
-<<<<<<< HEAD
-				Object arinvoices_item0soitemObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item0soitemQueryWrapper,saleorderPagination.getMenuId(),"jg_arinvoices_item0soitem"));
-=======
 				Object arinvoices_item0soitemObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item0soitemQueryWrapper,saleorderitemPagination.getMenuId(),"arinvoices_item0soitem"));
->>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
             if (ObjectUtil.isEmpty(arinvoices_item0soitemObj)){
                 return new ArrayList<>();
             } else {
@@ -182,13 +153,8 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
     }
     if(!isPc && appPermission){
 		if (!userProvider.get().getIsAdministrator()){
-<<<<<<< HEAD
-			Object saleorderObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderQueryWrapper,saleorderPagination.getMenuId(),"jg_saleorder"));
-            if (ObjectUtil.isEmpty(saleorderObj)){
-=======
 			Object saleorderitemObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderitemQueryWrapper,saleorderitemPagination.getMenuId(),"saleorderitem"));
             if (ObjectUtil.isEmpty(saleorderitemObj)){
->>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
                 return new ArrayList<>();
             } else {
             saleorderitemQueryWrapper = (QueryWrapper<SaleorderitemEntity>)saleorderitemObj;
@@ -196,11 +162,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
 			}
 
 
-<<<<<<< HEAD
-			Object salesorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(salesorder_item0QueryWrapper,saleorderPagination.getMenuId(),"jg_salesorder_item0"));
-=======
 			Object salesorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(salesorder_item0QueryWrapper,saleorderitemPagination.getMenuId(),"salesorder_item0"));
->>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
             if (ObjectUtil.isEmpty(salesorder_item0Obj)){
                 return new ArrayList<>();
             } else {
@@ -209,11 +171,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
 			}
 
 
-<<<<<<< HEAD
-			Object receiptoutsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutsoitemQueryWrapper,saleorderPagination.getMenuId(),"jg_receiptoutsoitem"));
-=======
 			Object receiptoutsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutsoitemQueryWrapper,saleorderitemPagination.getMenuId(),"receiptoutsoitem"));
->>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
             if (ObjectUtil.isEmpty(receiptoutsoitemObj)){
                 return new ArrayList<>();
             } else {
@@ -222,11 +180,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
 			}
 
 
-<<<<<<< HEAD
-			Object collectionsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionsoitemQueryWrapper,saleorderPagination.getMenuId(),"jg_collectionsoitem"));
-=======
 			Object collectionsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionsoitemQueryWrapper,saleorderitemPagination.getMenuId(),"collectionsoitem"));
->>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
             if (ObjectUtil.isEmpty(collectionsoitemObj)){
                 return new ArrayList<>();
             } else {
@@ -235,11 +189,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
 			}
 
 
-<<<<<<< HEAD
-			Object salesbacksoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(salesbacksoitemQueryWrapper,saleorderPagination.getMenuId(),"jg_salesbacksoitem"));
-=======
 			Object salesbacksoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(salesbacksoitemQueryWrapper,saleorderitemPagination.getMenuId(),"salesbacksoitem"));
->>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
             if (ObjectUtil.isEmpty(salesbacksoitemObj)){
                 return new ArrayList<>();
             } else {
@@ -248,11 +198,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
 			}
 
 
-<<<<<<< HEAD
-			Object paymentsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentsoitemQueryWrapper,saleorderPagination.getMenuId(),"jg_paymentsoitem"));
-=======
 			Object paymentsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentsoitemQueryWrapper,saleorderitemPagination.getMenuId(),"paymentsoitem"));
->>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
             if (ObjectUtil.isEmpty(paymentsoitemObj)){
                 return new ArrayList<>();
             } else {
@@ -261,11 +207,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
 			}
 
 
-<<<<<<< HEAD
-			Object arinvoices_item0soitemObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item0soitemQueryWrapper,saleorderPagination.getMenuId(),"jg_arinvoices_item0soitem"));
-=======
 			Object arinvoices_item0soitemObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item0soitemQueryWrapper,saleorderitemPagination.getMenuId(),"arinvoices_item0soitem"));
->>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
             if (ObjectUtil.isEmpty(arinvoices_item0soitemObj)){
                 return new ArrayList<>();
             } else {
@@ -332,83 +274,54 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
         QueryWrapper<PaymentsoitemEntity> paymentsoitemQueryWrapper=new QueryWrapper<>();
 		int arinvoices_item0soitemNum =0;
         QueryWrapper<Arinvoices_item0soitemEntity> arinvoices_item0soitemQueryWrapper=new QueryWrapper<>();
-    boolean pcPermission = true;
+    boolean pcPermission = false;
-    boolean appPermission = true;
+    boolean appPermission = false;
     boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
     if(isPc && pcPermission){
 		if (!userProvider.get().getIsAdministrator()){
-<<<<<<< HEAD
-				Object saleorderObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderQueryWrapper,saleorderPagination.getMenuId(),"jg_saleorder"));
-            if (ObjectUtil.isEmpty(saleorderObj)){
-=======
 				Object saleorderitemObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderitemQueryWrapper,saleorderitemPagination.getMenuId(),"saleorderitem"));
             if (ObjectUtil.isEmpty(saleorderitemObj)){
->>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
                 return new ArrayList<>();
             } else {
                 saleorderitemQueryWrapper = (QueryWrapper<SaleorderitemEntity>)saleorderitemObj;
                 saleorderitemNum++;
             }
-<<<<<<< HEAD
-				Object salesorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(salesorder_item0QueryWrapper,saleorderPagination.getMenuId(),"jg_salesorder_item0"));
-=======
 				Object salesorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(salesorder_item0QueryWrapper,saleorderitemPagination.getMenuId(),"salesorder_item0"));
->>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
             if (ObjectUtil.isEmpty(salesorder_item0Obj)){
                 return new ArrayList<>();
             } else {
                 salesorder_item0QueryWrapper = (QueryWrapper<Salesorder_item0Entity>)salesorder_item0Obj;
                 salesorder_item0Num++;
             }
-<<<<<<< HEAD
-				Object receiptoutsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutsoitemQueryWrapper,saleorderPagination.getMenuId(),"jg_receiptoutsoitem"));
-=======
 				Object receiptoutsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutsoitemQueryWrapper,saleorderitemPagination.getMenuId(),"receiptoutsoitem"));
->>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
             if (ObjectUtil.isEmpty(receiptoutsoitemObj)){
                 return new ArrayList<>();
             } else {
                 receiptoutsoitemQueryWrapper = (QueryWrapper<ReceiptoutsoitemEntity>)receiptoutsoitemObj;
                 receiptoutsoitemNum++;
             }
-<<<<<<< HEAD
-				Object collectionsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionsoitemQueryWrapper,saleorderPagination.getMenuId(),"jg_collectionsoitem"));
-=======
 				Object collectionsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionsoitemQueryWrapper,saleorderitemPagination.getMenuId(),"collectionsoitem"));
->>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
             if (ObjectUtil.isEmpty(collectionsoitemObj)){
                 return new ArrayList<>();
             } else {
                 collectionsoitemQueryWrapper = (QueryWrapper<CollectionsoitemEntity>)collectionsoitemObj;
                 collectionsoitemNum++;
             }
-<<<<<<< HEAD
-				Object salesbacksoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(salesbacksoitemQueryWrapper,saleorderPagination.getMenuId(),"jg_salesbacksoitem"));
-=======
 				Object salesbacksoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(salesbacksoitemQueryWrapper,saleorderitemPagination.getMenuId(),"salesbacksoitem"));
->>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
             if (ObjectUtil.isEmpty(salesbacksoitemObj)){
                 return new ArrayList<>();
             } else {
                 salesbacksoitemQueryWrapper = (QueryWrapper<SalesbacksoitemEntity>)salesbacksoitemObj;
                 salesbacksoitemNum++;
             }
-<<<<<<< HEAD
-				Object paymentsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentsoitemQueryWrapper,saleorderPagination.getMenuId(),"jg_paymentsoitem"));
-=======
 				Object paymentsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentsoitemQueryWrapper,saleorderitemPagination.getMenuId(),"paymentsoitem"));
->>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
             if (ObjectUtil.isEmpty(paymentsoitemObj)){
                 return new ArrayList<>();
             } else {
                 paymentsoitemQueryWrapper = (QueryWrapper<PaymentsoitemEntity>)paymentsoitemObj;
                 paymentsoitemNum++;
             }
-<<<<<<< HEAD
-				Object arinvoices_item0soitemObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item0soitemQueryWrapper,saleorderPagination.getMenuId(),"jg_arinvoices_item0soitem"));
-=======
 				Object arinvoices_item0soitemObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item0soitemQueryWrapper,saleorderitemPagination.getMenuId(),"arinvoices_item0soitem"));
->>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
             if (ObjectUtil.isEmpty(arinvoices_item0soitemObj)){
                 return new ArrayList<>();
             } else {
@@ -419,13 +332,8 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
     }
     if(!isPc && appPermission){
 		if (!userProvider.get().getIsAdministrator()){
-<<<<<<< HEAD
-			Object saleorderObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderQueryWrapper,saleorderPagination.getMenuId(),"jg_saleorder"));
-            if (ObjectUtil.isEmpty(saleorderObj)){
-=======
 			Object saleorderitemObj=authorizeService.getCondition(new AuthorizeConditionModel(saleorderitemQueryWrapper,saleorderitemPagination.getMenuId(),"saleorderitem"));
             if (ObjectUtil.isEmpty(saleorderitemObj)){
->>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
                 return new ArrayList<>();
             } else {
             saleorderitemQueryWrapper = (QueryWrapper<SaleorderitemEntity>)saleorderitemObj;
@@ -433,11 +341,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
 			}
 
 
-<<<<<<< HEAD
-			Object salesorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(salesorder_item0QueryWrapper,saleorderPagination.getMenuId(),"jg_salesorder_item0"));
-=======
 			Object salesorder_item0Obj=authorizeService.getCondition(new AuthorizeConditionModel(salesorder_item0QueryWrapper,saleorderitemPagination.getMenuId(),"salesorder_item0"));
->>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
             if (ObjectUtil.isEmpty(salesorder_item0Obj)){
                 return new ArrayList<>();
             } else {
@@ -446,11 +350,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
 			}
 
 
-<<<<<<< HEAD
-			Object receiptoutsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutsoitemQueryWrapper,saleorderPagination.getMenuId(),"jg_receiptoutsoitem"));
-=======
 			Object receiptoutsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutsoitemQueryWrapper,saleorderitemPagination.getMenuId(),"receiptoutsoitem"));
->>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
             if (ObjectUtil.isEmpty(receiptoutsoitemObj)){
                 return new ArrayList<>();
             } else {
@@ -459,11 +359,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
 			}
 
 
-<<<<<<< HEAD
-			Object collectionsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionsoitemQueryWrapper,saleorderPagination.getMenuId(),"jg_collectionsoitem"));
-=======
 			Object collectionsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionsoitemQueryWrapper,saleorderitemPagination.getMenuId(),"collectionsoitem"));
->>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
             if (ObjectUtil.isEmpty(collectionsoitemObj)){
                 return new ArrayList<>();
             } else {
@@ -472,11 +368,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
 			}
 
 
-<<<<<<< HEAD
-			Object salesbacksoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(salesbacksoitemQueryWrapper,saleorderPagination.getMenuId(),"jg_salesbacksoitem"));
-=======
 			Object salesbacksoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(salesbacksoitemQueryWrapper,saleorderitemPagination.getMenuId(),"salesbacksoitem"));
->>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
             if (ObjectUtil.isEmpty(salesbacksoitemObj)){
                 return new ArrayList<>();
             } else {
@@ -485,11 +377,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
 			}
 
 
-<<<<<<< HEAD
-			Object paymentsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentsoitemQueryWrapper,saleorderPagination.getMenuId(),"jg_paymentsoitem"));
-=======
 			Object paymentsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentsoitemQueryWrapper,saleorderitemPagination.getMenuId(),"paymentsoitem"));
->>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
             if (ObjectUtil.isEmpty(paymentsoitemObj)){
                 return new ArrayList<>();
             } else {
@@ -498,11 +386,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
 			}
 
 
-<<<<<<< HEAD
-			Object arinvoices_item0soitemObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item0soitemQueryWrapper,saleorderPagination.getMenuId(),"jg_arinvoices_item0soitem"));
-=======
 			Object arinvoices_item0soitemObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item0soitemQueryWrapper,saleorderitemPagination.getMenuId(),"arinvoices_item0soitem"));
->>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
             if (ObjectUtil.isEmpty(arinvoices_item0soitemObj)){
                 return new ArrayList<>();
             } else {

SC-web/src/views/scm/basicInformation/reportforms/tradeGrossProfit.vue

@@ -238,4 +238,3 @@ export default {
     }
 }
 </script>
-