yunxi
/
SC-MOM
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

采购销售加业务日期

Browse Source
product
bawei 1 year ago
parent 916ca4bb1d
commit 74b95db9df
12 changed files with 54 additions and 11 deletions
Show Stats Download Patch File Download Diff File

4
SC-boot/linkage-scm/src/main/java/jnpf/contractfile/model/contractfile/ContractFileCrForm.java
Unescape View File

@ -123,6 +123,10 @@ public class ContractFileCrForm {
@JsonProperty("approval") @JsonProperty("approval")
private String approval; private String approval;
/** 保证金 **/
@JsonProperty("bond")
private String bond;
/** 子表数据 **/ /** 子表数据 **/
@JsonProperty("contract_item0List") @JsonProperty("contract_item0List")
private List<Contract_item0Model> contract_item0List; private List<Contract_item0Model> contract_item0List;

3
SC-boot/linkage-scm/src/main/java/jnpf/contractfile/model/contractfile/ContractFileModel.java
Unescape View File

@ -42,7 +42,8 @@ public class ContractFileModel {
private String status; private String status;
@Excel(name = "集团审批") @Excel(name = "集团审批")
private String approval; private String approval;
@Excel(name = "保证金")
private String bond;
private List<ContractFileModel> list; private List<ContractFileModel> list;
private String creatorTime; private String creatorTime;
private String code; private String code;

1
SC-boot/linkage-scm/src/main/java/jnpf/contractfile/service/impl/ContractFileServiceImpl.java
Unescape View File

@ -405,6 +405,7 @@ public class ContractFileServiceImpl extends ServiceImpl<ContractFileMapper, Con
dataRowMap.put("creatorusername", model.getCreatorusername()); dataRowMap.put("creatorusername", model.getCreatorusername());
dataRowMap.put("status", model.getStatus()); dataRowMap.put("status", model.getStatus());
dataRowMap.put("approval", model.getApproval()); dataRowMap.put("approval", model.getApproval());
dataRowMap.put("bond", model.getBond());
dataRow.add(dataRowMap); dataRow.add(dataRowMap);
} }
} }

1
SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderPagination.java
Unescape View File

@ -23,6 +23,7 @@ public class PurchaseorderPagination extends Pagination {
private String purchaseName; private String purchaseName;
private String supplierName; private String supplierName;
private List<String> creatorTime; private List<String> creatorTime;
private List<String> businessDate;
private String status; private String status;
private Date startDate; private Date startDate;
private Date endDate; private Date endDate;

5
SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java
Unescape View File

@ -1398,8 +1398,9 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
} }
} }
if (StringUtil.isNotEmpty(purchaseorderPagination.getCreatorTime())) { //查询日期 修改为业务日期2023/7/11
List<String> PoundDateList = purchaseorderPagination.getCreatorTime(); if (StringUtil.isNotEmpty(purchaseorderPagination.getBusinessDate())) {
List<String> PoundDateList = purchaseorderPagination.getBusinessDate();
Long fir = Long.valueOf(PoundDateList.get(0)); Long fir = Long.valueOf(PoundDateList.get(0));
Long sec = Long.valueOf(PoundDateList.get(1)); Long sec = Long.valueOf(PoundDateList.get(1));
purchaseorderPagination.setStartDate(new Date(fir)); purchaseorderPagination.setStartDate(new Date(fir));

1
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemPagination.java
Unescape View File

@ -34,6 +34,7 @@ public class SaleorderitemPagination extends Pagination {
private Date endDate; private Date endDate;
private List<String> creatorTime; private List<String> creatorTime;
private List<String> businessDate;
/** /**
* 添加权限 * 添加权限

5
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/SaleorderitemServiceImpl.java
Unescape View File

@ -232,8 +232,9 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
if(AllIdList.size()>0){ if(AllIdList.size()>0){
saleorderitemQueryWrapper.lambda().in(SaleorderitemEntity::getId, AllIdList); saleorderitemQueryWrapper.lambda().in(SaleorderitemEntity::getId, AllIdList);
} }
if (StringUtil.isNotEmpty(saleorderitemPagination.getCreatorTime())) { //修改为业务日期7.11
List<String> PoundDateList = saleorderitemPagination.getCreatorTime(); if (StringUtil.isNotEmpty(saleorderitemPagination.getBusinessDate())) {
List<String> PoundDateList = saleorderitemPagination.getBusinessDate();
Long fir = Long.valueOf(PoundDateList.get(0)); Long fir = Long.valueOf(PoundDateList.get(0));
Long sec = Long.valueOf(PoundDateList.get(1)); Long sec = Long.valueOf(PoundDateList.get(1));
saleorderitemPagination.setStartDate(new Date(fir)); saleorderitemPagination.setStartDate(new Date(fir));

2
SC-boot/linkage-scm/src/main/resources/mapper/purchaseorder/PurchaseorderMapper.xml
Unescape View File

@ -351,7 +351,7 @@
AND (c.contract_name LIKE CONCAT('%',#{purchaseorderPagination.keyword},'%') OR b.supplier_name LIKE CONCAT('%',#{purchaseorderPagination.keyword},'%')) AND (c.contract_name LIKE CONCAT('%',#{purchaseorderPagination.keyword},'%') OR b.supplier_name LIKE CONCAT('%',#{purchaseorderPagination.keyword},'%'))
</if> </if>
<if test="purchaseorderPagination.startDate != null and purchaseorderPagination.endDate != null"> <if test="purchaseorderPagination.startDate != null and purchaseorderPagination.endDate != null">
AND a.creator_time &gt; #{purchaseorderPagination.startDate} AND a.creator_time &lt;= #{purchaseorderPagination.endDate} AND a.business_date &gt; #{purchaseorderPagination.startDate} AND a.business_date &lt;= #{purchaseorderPagination.endDate}
</if> </if>
<choose> <choose>

2
SC-boot/linkage-scm/src/main/resources/mapper/salesorderitem/SaleorderMapper.xml
Unescape View File

@ -34,7 +34,7 @@
and a.creator_user_name LIKE CONCAT('%',#{saleorderitemPagination.creatorUserName},'%') and a.creator_user_name LIKE CONCAT('%',#{saleorderitemPagination.creatorUserName},'%')
</if> </if>
<if test="saleorderitemPagination.startDate != null and saleorderitemPagination.endDate != null"> <if test="saleorderitemPagination.startDate != null and saleorderitemPagination.endDate != null">
and a.creator_time &gt; #{saleorderitemPagination.startDate} AND a.creator_time &lt;= #{saleorderitemPagination.endDate} and a.business_date &gt; #{saleorderitemPagination.startDate} AND a.business_date &lt;= #{saleorderitemPagination.endDate}
</if> </if>
<if test="saleorderitemPagination.sidx != null and saleorderitemPagination.sidx != ''"> <if test="saleorderitemPagination.sidx != null and saleorderitemPagination.sidx != ''">
ORDER BY ${saleorderitemPagination.sidx} ${saleorderitemPagination.sort} ORDER BY ${saleorderitemPagination.sidx} ${saleorderitemPagination.sort}

6
SC-web/src/views/scm/basicInformation/contractfile/ImportForm.vue
Unescape View File

@ -109,6 +109,11 @@
<el-input v-model="scope.row.approval" /> <el-input v-model="scope.row.approval" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="bond" label="保证金" width="150">
<template slot-scope="scope">
<el-input v-model="scope.row.bond" />
</template>
</el-table-column>
<el-table-column label="操作" width="50"> <el-table-column label="操作" width="50">
<template slot-scope="scope"> <template slot-scope="scope">
@ -156,6 +161,7 @@
<el-table-column prop="creatorusername" label="录入人" width="120" /> <el-table-column prop="creatorusername" label="录入人" width="120" />
<el-table-column prop="status" label="单据状态" width="150" /> <el-table-column prop="status" label="单据状态" width="150" />
<el-table-column prop="approval" label="集团审批" width="100" /> <el-table-column prop="approval" label="集团审批" width="100" />
<el-table-column prop="bond" label="保证金" width="100" />
</JNPF-table> </JNPF-table>
</div> </div>
</div> </div>

18
SC-web/src/views/scm/basicInformation/purchaseorder/index.vue
Unescape View File

@ -59,10 +59,23 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="6">-->
<!-- <el-form-item label="制单日期">-->
<!-- <el-date-picker-->
<!-- v-model="query.creatorTime"-->
<!-- type="daterange"-->
<!-- value-format="timestamp"-->
<!-- format="yyyy-MM-dd"-->
<!-- start-placeholder="开始日期"-->
<!-- end-placeholder="结束日期"-->
<!-- >-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="6"> <el-col :span="6">
<el-form-item label="制单日期"> <el-form-item label="业务日期">
<el-date-picker <el-date-picker
v-model="query.creatorTime" v-model="query.businessDate"
type="daterange" type="daterange"
value-format="timestamp" value-format="timestamp"
format="yyyy-MM-dd" format="yyyy-MM-dd"
@ -802,6 +815,7 @@
res.data.list[i].creatorTime = res.data.list[i].creatorTime res.data.list[i].creatorTime = res.data.list[i].creatorTime
? res.data.list[i].creatorTime.substring(0, 10) ? res.data.list[i].creatorTime.substring(0, 10)
: ""; : "";
let _data = res.data.list[i]; let _data = res.data.list[i];
_list.push(_data); _list.push(_data);
} }

17
SC-web/src/views/scm/basicInformation/saleorder/index.vue
Unescape View File

@ -76,10 +76,23 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="6">-->
<!-- <el-form-item label="制单日期">-->
<!-- <el-date-picker-->
<!-- v-model="query.creatorTime"-->
<!-- type="daterange"-->
<!-- value-format="timestamp"-->
<!-- format="yyyy-MM-dd"-->
<!-- start-placeholder="开始日期"-->
<!-- end-placeholder="结束日期"-->
<!-- >-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="6"> <el-col :span="6">
<el-form-item label="制单日期"> <el-form-item label="业务日期">
<el-date-picker <el-date-picker
v-model="query.creatorTime" v-model="query.businessDate"
type="daterange" type="daterange"
value-format="timestamp" value-format="timestamp"
format="yyyy-MM-dd" format="yyyy-MM-dd"

Write Preview
Loading…
Cancel
Save