客户供应商服务商财务数据权限

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

@@ -16,25 +16,26 @@
         WHERE  t1.f_delete_mark IS NULL AND t1.id = #{id}
     </select>
 
-    <select id="queryByKeyword" resultType="jnpf.entity.WarehousingStorageEntity">
+    <select id="queryByKeywordCaigou" resultType="jnpf.entity.WarehousingStorageEntity">
         SELECT a.id storageId,
         a.document_no documentNo,
         a.warehousing_id warehousingId,
         a.warehouse_id warehouseId,
         a.warehousing_time warehousingTime,
         d.code orderCode,
-        (SELECT COUNT(1) from jg_warehousing_outbound_product WHERE warehousing_outbound_id = a.id) skuNum,
-        (SELECT COUNT(1) from jg_warehousing_outbound_poundlist WHERE warehousing_outbound_id = a.id) voucherNum,
+        (SELECT COUNT(1) from jg_warehousing_storage_product WHERE warehousing_storage_id = a.id) skuNum,
+        (SELECT COUNT(1) from jg_warehousing_storage_poundlist WHERE warehousing_storage_id = a.id) voucherNum,
         a.f_creator_time storageTime,
-        case a.warehousing_outbound_type WHEN 1 THEN '销售出库' WHEN 3 THEN '退供出库' WHEN 12 THEN '销售发货单出库' WHEN 9 THEN '库存初始化' END warehousingStorageType,
+        case a.warehousing_storage_type WHEN 1 THEN '采购入库' WHEN 3 THEN '退货入库' WHEN 11 THEN '库存初始化' WHEN 15 THEN '采购收货单入库' END warehousingStorageType,
         e.name warehouseName
-        from jg_warehousing_outbound a
+        from jg_warehousing_storage a
         LEFT JOIN flow_task b on a.id = b.f_process_id
         LEFT JOIN jg_warehousing_notification c ON a.warehousing_id = c.id
         LEFT JOIN jg_business_order d ON c.business_id = d.id
-        LEFT JOIN jg_business_line e ON a.warehouse_id = e.id ${ew.customSqlSegment}
-        and a.f_delete_mark is null and a.document_no not in (SELECT document_no from jg_cw_account_storage where f_delete_mark is null)
-        and (b.f_status = '2' OR b.f_status is null) and a.warehousing_outbound_type in (1,3,12,9)
+        LEFT JOIN jg_business_line e ON a.warehouse_id = e.id
+        ${ew.customSqlSegment} and a.f_delete_mark is null and a.document_no not in (SELECT document_no from jg_cw_account_storage where f_delete_mark is null)
+        and (b.f_status = '2' OR b.f_status is null) and a.warehousing_storage_type in (1,3,11,15)
+        and d.first_subject_basic_id = #{warehousingStoragePagination.subjectId} and d.contract_id = #{warehousingStoragePagination.contractId}
         <if test="warehousingStoragePagination.excludeIdList!= null and warehousingStoragePagination.excludeIdList.size()>0">
             and a.id not in
             <foreach item="item" index="index" collection="warehousingStoragePagination.excludeIdList"
@@ -42,25 +43,28 @@
                 #{item}
             </foreach>
         </if>
-        UNION ALL
+    </select>
+
+    <select id="queryByKeywordXiaoshou" resultType="jnpf.entity.WarehousingStorageEntity">
         SELECT a.id storageId,
         a.document_no documentNo,
         a.warehousing_id warehousingId,
         a.warehouse_id warehouseId,
         a.warehousing_time warehousingTime,
         d.code orderCode,
-        (SELECT COUNT(1) from jg_warehousing_storage_product WHERE warehousing_storage_id = a.id) skuNum,
-        (SELECT COUNT(1) from jg_warehousing_storage_poundlist WHERE warehousing_storage_id = a.id) voucherNum,
+        (SELECT COUNT(1) from jg_warehousing_outbound_product WHERE warehousing_outbound_id = a.id) skuNum,
+        (SELECT COUNT(1) from jg_warehousing_outbound_poundlist WHERE warehousing_outbound_id = a.id) voucherNum,
         a.f_creator_time storageTime,
-        case a.warehousing_storage_type WHEN 1 THEN '采购入库' WHEN 3 THEN '退货入库' WHEN 11 THEN '库存初始化' WHEN 15 THEN '采购收货单入库' END warehousingStorageType,
+        case a.warehousing_outbound_type WHEN 1 THEN '销售出库' WHEN 3 THEN '退供出库' WHEN 12 THEN '销售发货单出库' WHEN 9 THEN '库存初始化' END warehousingStorageType,
         e.name warehouseName
-        from jg_warehousing_storage a
+        from jg_warehousing_outbound a
         LEFT JOIN flow_task b on a.id = b.f_process_id
         LEFT JOIN jg_warehousing_notification c ON a.warehousing_id = c.id
         LEFT JOIN jg_business_order d ON c.business_id = d.id
-        LEFT JOIN jg_business_line e ON a.warehouse_id = e.id
-        ${ew.customSqlSegment} and a.f_delete_mark is null and a.document_no not in (SELECT document_no from jg_cw_account_storage where f_delete_mark is null)
-        and (b.f_status = '2' OR b.f_status is null) and a.warehousing_storage_type in (1,3,11,15)
+        LEFT JOIN jg_business_line e ON a.warehouse_id = e.id ${ew.customSqlSegment}
+        and a.f_delete_mark is null and a.document_no not in (SELECT document_no from jg_cw_account_storage where f_delete_mark is null)
+        and (b.f_status = '2' OR b.f_status is null) and a.warehousing_outbound_type in (1,3,12,9)
+        and d.first_subject_basic_id = #{warehousingStoragePagination.subjectId} and d.contract_id = #{warehousingStoragePagination.contractId}
         <if test="warehousingStoragePagination.excludeIdList!= null and warehousingStoragePagination.excludeIdList.size()>0">
             and a.id not in
             <foreach item="item" index="index" collection="warehousingStoragePagination.excludeIdList"

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

@@ -25,9 +25,12 @@ public interface WarehousingStorageMapper extends BaseMapper<WarehousingStorageE
     //关联采购单号
     String queryPurchaseNo(String id);
 
-    IPage<WarehousingStorageEntity> queryByKeyword(@Param("page") Page<WarehousingStorageEntity> page, @Param("warehousingStoragePagination") WarehousingStoragePagination warehousingStoragePagination, @Param("ew") QueryWrapper<WarehousingStorageEntity> warehousingStorageQueryWrapper);
+    IPage<WarehousingStorageEntity> queryByKeywordCaigou(@Param("page") Page<WarehousingStorageEntity> page, @Param("warehousingStoragePagination") WarehousingStoragePagination warehousingStoragePagination, @Param("ew") QueryWrapper<WarehousingStorageEntity> warehousingStorageQueryWrapper);
+
+    IPage<WarehousingStorageEntity> queryByKeywordXiaoshou(@Param("page") Page<WarehousingStorageEntity> page, @Param("warehousingStoragePagination") WarehousingStoragePagination warehousingStoragePagination, @Param("ew") QueryWrapper<WarehousingStorageEntity> warehousingStorageQueryWrapper);
 
     BigDecimal queryCurrentDayNum(@Param("warehousingStorage") WarehousingStorageEntity warehousingStorage);
 
     BigDecimal queryCurrentDayNum2(@Param("warehousingStorage") WarehousingStorageEntity warehousingStorage);
+
 }

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

@@ -1077,7 +1077,13 @@ public class WarehousingStorageServiceImpl extends ServiceImpl<WarehousingStorag
                     warehousingStorageQueryWrapper.like("a.organize_json_id",organize);
                 }
                 warehousingStorageQueryWrapper.isNull("a.f_delete_mark");
-                IPage<WarehousingStorageEntity> userIPage = warehousingStorageMapper.queryByKeyword(page, warehousingStoragePagination, warehousingStorageQueryWrapper);
+                IPage<WarehousingStorageEntity> userIPage;
+                if(StringUtil.equals(warehousingStoragePagination.getType(), "1")){
+                    userIPage = warehousingStorageMapper.queryByKeywordCaigou(page, warehousingStoragePagination, warehousingStorageQueryWrapper);
+                }else{
+                    userIPage = warehousingStorageMapper.queryByKeywordXiaoshou(page, warehousingStoragePagination, warehousingStorageQueryWrapper);
+                }
+
 
                 return warehousingStoragePagination.setData(userIPage.getRecords(),userIPage.getTotal());
             }else{

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/warehousingstorage/WarehousingStoragePagination.java

@@ -52,4 +52,7 @@ public class WarehousingStoragePagination extends Pagination {
     private List<String> storageIdList;
     @JsonProperty("outboundIdList")
     private List<String> outboundIdList;
+    private String subjectId;
+    private String contractId;
+    private String type;
 }

jnpf-java-boot/jnpf-web/src/views/extend/cwaccount/Warehousingstorageoutbound.vue

@@ -67,20 +67,35 @@ export default {
         sidx: "",
       },
       excludeIdList: [],
+      subjectId: '',
+      contractId: '',
+      type: '',
       checked: []
     }
   },
   methods: {
-    init(excludeIdList) {
+    init(excludeIdList, subjectId, contractId, type) {
       this.visible = true
       this.listLoading = true
       if (excludeIdList && excludeIdList instanceof Array) {
         this.excludeIdList = excludeIdList;
       }
+      if (subjectId && typeof(subjectId) == 'string') {
+        this.subjectId = subjectId;
+      }
+      if (contractId && typeof(contractId) == 'string') {
+        this.contractId = contractId;
+      }
+      if (type && typeof(type) == 'string') {
+        this.type = type;
+      }
       let query = {
         ...this.listQuery,
         keyword: this.keyword,
         excludeIdList: this.excludeIdList,
+        subjectId: this.subjectId,
+        contractId: this.contractId,
+        type: this.type,
         dataType: 0,
       }
       /* GoodsList(query).then(res => {

jnpf-java-boot/jnpf-web/src/views/extend/cwaccount/form.vue

@@ -1724,9 +1724,6 @@
         }, {
           "fullName": "销售对账",
           "id": "2"
-        }, {
-          "fullName": "其他对账",
-          "id": "3"
         }],
         typeProps: {
           "label": "fullName",
@@ -2075,7 +2072,6 @@
         this.dataForm.contractType = '';
       },
       contractChangeData(model, row){
-        debugger
         this.dataForm.cwaccountcontractList[0].contractName = row.contract_name
         this.dataForm.cwaccountcontractList[0].contractPeriodTime = row.contract_period_time ? row.contract_period_time.substring(0, 10) : '';
         this.dataForm.cwaccountcontractList[0].contractPeriodTimeEnd = row.contract_period_time_end ? row.contract_period_time_end.substring(0, 10) : '';
@@ -2539,13 +2535,29 @@
         this.childIndex = -1
       },
       choice() {
+        if(!this.dataForm.cwaccountsubjectList[0] || this.dataForm.cwaccountsubjectList[0].subjectId == ''){
+          this.$message({
+            type: 'error',
+            message: '请先选择供应商/客户/服务商信息',
+            duration: 1500,
+          })
+          return
+        }
+        if(!this.dataForm.cwaccountcontractList[0] || this.dataForm.cwaccountcontractList[0].contractId == ''){
+          this.$message({
+            type: 'error',
+            message: '请先选择合同信息',
+            duration: 1500,
+          })
+          return
+        }
         this.goodsBoxVisible = true
         let excludeIdList = [];
         for (let i = 0; i < this.dataForm.cwaccountstorageList.length; i++) {
           excludeIdList.push(this.dataForm.cwaccountstorageList[i].storageId);
         }
         this.$nextTick(() => {
-          this.$refs.goodsBox.init(excludeIdList)
+          this.$refs.goodsBox.init(excludeIdList, this.dataForm.cwaccountsubjectList[0].subjectId, this.dataForm.cwaccountcontractList[0].contractId, this.dataForm.type)
         })
       },
       delcwaccountstorageList(index) {

jnpf-java-boot/jnpf-web/src/views/extend/cwpaymentreceipt/form.vue

@@ -21,7 +21,7 @@
           </el-col>
           <el-col :span="24" v-if="judgeShow('type')">
             <jnpf-form-tip-item label="类型" v-if="judgeShow('type')" prop="type">
-              <JnpfRadio v-model="dataForm.type" @change="changeData('type',-1)" :disabled="judgeWrite('type')"
+              <JnpfRadio v-model="dataForm.type" @change="changeData('type',-1)" :disabled="true"
                 optionType="button" direction="horizontal" size="medium" :options="typeOptions" :props="typeProps">
               </JnpfRadio>
             </jnpf-form-tip-item>
@@ -650,9 +650,6 @@
         }, {
           "fullName": "销售付款",
           "id": "2"
-        }, {
-          "fullName": "其他付款",
-          "id": "3"
         }],
         typeProps: {
           "label": "fullName",

jnpf-java-boot/jnpf-web/src/views/extend/cwpaymentreceipt/index.vue

@@ -43,8 +43,8 @@
       <div class="JNPF-common-layout-main JNPF-flex-main">
         <div class="JNPF-common-head">
           <div>
-            <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="addOrUpdateHandle()">新增
-            </el-button>
+            <!-- <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="addOrUpdateHandle()">新增
+            </el-button> -->
             <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" v-has="'btn_download'">导出
             </el-button>
           </div>

jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/form.vue

@@ -1828,9 +1828,6 @@
         }, {
           "fullName": "销售结算",
           "id": "2"
-        }, {
-          "fullName": "其他结算",
-          "id": "3"
         }],
         typeProps: {
           "label": "fullName",
@@ -2268,7 +2265,7 @@
           excludeIdList.push(this.dataForm.cwsettlementaccountList[i].accountId);
         }
         this.$nextTick(() => {
-          this.$refs.goodsBox.init(excludeIdList, this.dataForm.cwsettlementsubjectList[0].subjectName, this.dataForm.cwsettlementcontractList[0].contractName, '1')
+          this.$refs.goodsBox.init(excludeIdList, this.dataForm.cwsettlementsubjectList[0].subjectName, this.dataForm.cwsettlementcontractList[0].contractName, '1', this.dataForm.type)
         })
       },
       choice2() {

jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/settlementaccountList.vue

@@ -76,11 +76,12 @@ export default {
       accountSubjectName: '',
       contractCode: '',
       accountState: '',
+      type: '',
       checked: []
     }
   },
   methods: {
-    init(excludeIdList, accountSubjectName, contractCode, accountState) {
+    init(excludeIdList, accountSubjectName, contractCode, accountState, type) {
       this.visible = true
       this.listLoading = true
       if (excludeIdList && excludeIdList instanceof Array) {
@@ -95,6 +96,9 @@ export default {
       if (accountState && typeof(accountState) == 'string') {
         this.accountState = accountState;
       }
+      if (type && typeof(type) == 'string') {
+        this.type = type;
+      }
       let query = {
         ...this.listQuery,
         keyword: this.keyword,
@@ -102,6 +106,7 @@ export default {
         accountSubjectName: this.accountSubjectName,
         contractCode: this.contractCode,
         accountState: this.accountState,
+        type: this.type,
         dataType: 0,
         menuId: '532534014720895941',
         queryFlowTaskPass: '1'//查询审批通过的