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

销售问题

Browse Source
product
杨世强 2 years ago
parent f6e1079780
commit d352116c6f
15 changed files with 95 additions and 41 deletions
Show Stats Download Patch File Download Diff File

4
SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/entity/ArinvoicesEntity.java
Unescape View File

@ -122,10 +122,10 @@ public class ArinvoicesEntity {
private String contractId;
@TableField(exist = false)
List<Arinvoices_item0Entity> list0;
List<Arinvoices_item0Entity> arinvoices_item0EntityList;
@TableField(exist = false)
List<Arinvoices_item1Entity> list1;
List<Arinvoices_item1Entity> arinvoices_item1EntityList;
@TableField(exist = false)
private String sourceOrderNo;

6
SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/ArinvoicesPagination.java
Unescape View File

@ -4,6 +4,8 @@ package jnpf.arinvoices.model.arinvoices;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
import jnpf.base.Pagination;
import java.util.Date;
import java.util.List;
/**
@ -26,8 +28,8 @@ public class ArinvoicesPagination extends Pagination {
private String contractNm;
private String customerNm;
private String startDate;
private String endDate;
private Date startDate;
private Date endDate;
/** 业务日期 */
private List<String> businessDate;
/**

7
SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/impl/ArinvoicesServiceImpl.java
Unescape View File

@ -145,9 +145,10 @@ public class ArinvoicesServiceImpl extends ServiceImpl<ArinvoicesMapper, Arinvoi
List<String> BusinessDateList = arinvoicesPagination.getBusinessDate();
Long fir = Long.valueOf(BusinessDateList.get(0));
Long sec = Long.valueOf(BusinessDateList.get(1));
arinvoicesQueryWrapper.lambda().ge(ArinvoicesEntity::getBusinessDate, new Date(fir))
.le(ArinvoicesEntity::getBusinessDate, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
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"));
}

5
SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionListVO.java
Unescape View File

@ -88,6 +88,11 @@ public class CollectionListVO{
@JsonProperty("creatorUserName")
private String creatorUserName;
/** 制单时间 **/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@JsonProperty("creatorTime")
private Date creatorTime;
@TableField(exist = false)
private String contractNm;

6
SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutPagination.java
Unescape View File

@ -3,6 +3,8 @@ package jnpf.receiptout.model.receiptout;
import lombok.Data;
import jnpf.base.Pagination;
import java.util.Date;
import java.util.List;
/**
@ -27,8 +29,8 @@ public class ReceiptoutPagination extends Pagination {
private String customerNm;
private String sourceOrderNo;
private String startDate;
private String endDate;
private Date startDate;
private Date endDate;
/**
* 菜单id
*/

7
SC-boot/linkage-scm/src/main/java/jnpf/receiptout/service/impl/ReceiptoutServiceImpl.java
Unescape View File

@ -123,6 +123,13 @@ public class ReceiptoutServiceImpl extends ServiceImpl<ReceiptoutMapper, Receipt
receiptoutNum++;
receiptoutQueryWrapper.lambda().eq(ReceiptoutEntity::getType,receiptoutPagination.getType());
}
if(StringUtil.isNotEmpty(receiptoutPagination.getCreatorTime())){
List<String> creatorTime = receiptoutPagination.getCreatorTime();
Long fir = Long.valueOf(creatorTime.get(0));
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);

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

@ -24,6 +24,7 @@ public class SalebackPagination extends Pagination {
private String saledocumentNo;
private String status;
private List<String> creatorTime;
private Date startDate;
private Date endDate;

10
SC-boot/linkage-scm/src/main/java/jnpf/saleback/service/impl/SalebackServiceImpl.java
Unescape View File

@ -118,6 +118,16 @@ public class SalebackServiceImpl extends ServiceImpl<SalebackMapper, SalebackEnt
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);

43
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java
Unescape View File

@ -28,6 +28,8 @@ import jnpf.materialvo.entity.MaterialEntity;
import jnpf.materialvo.service.MaterialService;
import jnpf.poundlist.entity.PoundlistEntity;
import jnpf.poundlist.service.PoundlistService;
import jnpf.receiptin.entity.Receiptin_item0Entity;
import jnpf.receiptin.service.Receiptin_item0Service;
import jnpf.receiptout.entity.ReceiptoutEntity;
import jnpf.receiptout.entity.Receiptout_item0Entity;
import jnpf.receiptout.service.ReceiptoutService;
@ -141,6 +143,8 @@ public class SaleorderitemController {
private Arinvoices_item0Service arinvoices_item0Service;
@Autowired
private Arinvoices_item1Service arinvoices_item1Service;
@Autowired
private Receiptin_item0Service receiptin_item0Service;
/**
* 修改磅单单价
@ -176,16 +180,15 @@ public class SaleorderitemController {
queryWrapper1.lambda().eq(Salesorder_item0Entity::getSalesOrderId, saleorderitemEntity.getId());
List<Salesorder_item0Entity> dList = salesorder_item0Service.list(queryWrapper1);
for (Salesorder_item0Entity entity : dList){
QueryWrapper<MaterialEntity> queryWrapper2 = new QueryWrapper<>();
queryWrapper2.lambda().eq(MaterialEntity::getId,entity.getMaterialId());
MaterialEntity materialEntity = materialService.getOne(queryWrapper2);
if (ObjectUtils.isNotEmpty(materialEntity)) {
entity.setReservoirareaId(materialEntity.getOutArea());
QueryWrapper<ReservoirareaEntity> queryWrapper3 = new QueryWrapper<>();
queryWrapper3.lambda().eq(ReservoirareaEntity::getId,materialEntity.getOutArea());
ReservoirareaEntity reservoirareaEntity = reservoirareaService.getOne(queryWrapper3);
if (ObjectUtils.isNotEmpty(reservoirareaEntity)) {
entity.setWarehouseId(reservoirareaEntity.getWarehouseId());
QueryWrapper<Receiptin_item0Entity> queryWrapper2 = new QueryWrapper<>();
queryWrapper2.lambda().eq(Receiptin_item0Entity::getPoundlistId,entity.getPoundlistId());
List<Receiptin_item0Entity> receiptin_item0Entity = receiptin_item0Service.list(queryWrapper2);
if (receiptin_item0Entity.size()>0){
if (receiptin_item0Entity.get(0).getReservoirareaId() != null){
entity.setReservoirareaId(receiptin_item0Entity.get(0).getReservoirareaId());
}
if (receiptin_item0Entity.get(0).getWarehouseId() != null){
entity.setWarehouseId(receiptin_item0Entity.get(0).getWarehouseId());
}
}
QueryWrapper<PoundlistEntity> queryWrapper3 = new QueryWrapper<>();
@ -219,22 +222,20 @@ public class SaleorderitemController {
queryWrapper2.lambda().eq(ArinvoicesEntity::getSalesOrderId, id);
ArinvoicesEntity arinvoicesEntity = arinvoicesService.getOne(queryWrapper2);
if (ObjectUtils.isNotEmpty(arinvoicesEntity)) {
QueryWrapper<SaleorderitemEntity> salesqueryWrapper = new QueryWrapper<>();
salesqueryWrapper.lambda().eq(SaleorderitemEntity::getId, id);
SaleorderitemEntity Entity = saleorderitemService.getOne(salesqueryWrapper);
if (!Entity.getStatus().equals("2")){
return ActionResult.fail("数据状态不能发票录入");
}
QueryWrapper<Arinvoices_item0Entity> queryWrapper3 = new QueryWrapper<>();
queryWrapper3.lambda().eq(Arinvoices_item0Entity::getArinvoicesId,arinvoicesEntity.getId());
List<Arinvoices_item0Entity> list0 = arinvoices_item0Service.list(queryWrapper3);
QueryWrapper<Arinvoices_item1Entity> queryWrapper4 = new QueryWrapper<>();
queryWrapper4.lambda().eq(Arinvoices_item1Entity::getArinvoicesId,arinvoicesEntity.getId());
List<Arinvoices_item1Entity> list1 = arinvoices_item1Service.list(queryWrapper4);
BigDecimal amount = new BigDecimal(0);
BigDecimal quantity = new BigDecimal(0);
for (Arinvoices_item1Entity entity : list1){
amount = amount.add(entity.getAmount());
quantity = quantity.add(entity.getQuantity());
}
arinvoicesEntity.setAmount(amount);
arinvoicesEntity.setQuantity(quantity);
arinvoicesEntity.setList0(list0);
arinvoicesEntity.setList1(list1);
arinvoicesEntity.setArinvoices_item0EntityList(list0);
arinvoicesEntity.setArinvoices_item1EntityList(list1);
return ActionResult.success(arinvoicesEntity);
}else {
List<SaleorderitemEntity> list = new ArrayList<>();
@ -715,7 +716,7 @@ public class SaleorderitemController {
for(Salesorder_item0Model jg_salesorder_item0Model : jg_salesorder_item0ModelList){
Map<String,Object> vehicleIdMap = new HashMap<>();
jg_salesorder_item0Model.setVehicleId(generaterSwapUtil.getPopupSelectValue("381432451370615173","id","ticketno",jg_salesorder_item0Model.getVehicleId(),vehicleIdMap));
Map<String,Object> materialIdMap = new HashMap<>();
Map<String,Object> materialIdMap = new HashMap<>();
jg_salesorder_item0Model.setMaterialId(generaterSwapUtil.getPopupSelectValue("381037852907038533","id","item_name",jg_salesorder_item0Model.getMaterialId(),materialIdMap));
}
vo.setSalesorder_item0List(jg_salesorder_item0ModelList);

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

@ -239,9 +239,10 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
List<String> creatorTime = saleorderitemPagination.getCreatorTime();
Long fir = Long.valueOf(creatorTime.get(0));
Long sec = Long.valueOf(creatorTime.get(1));
saleorderitemQueryWrapper.lambda().ge(SaleorderitemEntity::getCreatorTime, new Date(fir))
.le(SaleorderitemEntity::getCreatorTime, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
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"));
}

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

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

4
SC-web/src/views/scm/basicInformation/collection/Form.vue
Unescape View File

@ -32,7 +32,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="收款金额" prop="amountCollected">
<el-input v-model="dataForm.amountCollected" placeholder="请输入" clearable :style='{"width":"100%"}' >
<el-input v-model="dataForm.amountCollected" placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
</el-input>
</el-form-item>
@ -120,7 +120,7 @@
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="amount" label="收款金额" align="center" width="130">
<template slot-scope="scope">
<el-input v-model="scope.row.amount" placeholder="请输入" clearable :style='{"width":"100%"}' @change="amountSum" disabled>
<el-input v-model="scope.row.amount" placeholder="请输入" clearable :style='{"width":"100%"}' @change="amountSum" >
</el-input>
</template>
</el-table-column>

23
SC-web/src/views/scm/basicInformation/saleback/index.vue
Unescape View File

@ -9,6 +9,29 @@
<el-input v-model="query.documentNo" placeholder="请输入" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="来源销售单号">
<el-input v-model="query.saledocumentNo" placeholder="请输入" clearable></el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="6">-->
<!-- <el-form-item label="单据状态 ">-->
<!-- <el-select v-model="query.status" placeholder="请选择"-->
<!-- clearable>-->
<!-- <el-option v-for="(item, index) in statusOptions" :key="index"-->
<!-- :label="item.fullName" :value="item.id"-->
<!-- :disabled="item.disabled"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </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-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>

1
SC-web/src/views/scm/basicInformation/saleorder/Form.vue
Unescape View File

@ -979,7 +979,6 @@
url: '/api/saleorder/Saleorderitem/' + this.dataForm.id,
method: 'get'
}).then(res => {
debugger
this.dataInfo(res.data)
this.loading = false
});

10
SC-web/src/views/scm/basicInformation/saleorder/arinvoicesForm.vue
Unescape View File

@ -550,14 +550,14 @@
this.visible = true;
this.dataForm = list2
this.dataForm.businessDate = new Date().getTime();
this.dataForm.arinvoices_item1List = list2.list1;
this.dataForm.arinvoices_item0List = list2.list0;
for (let i = 0;i<list2.list0.length;i++){
this.dataForm.arinvoices_item1List = list2.arinvoices_item1EntityList;
this.dataForm.arinvoices_item0List = list2.arinvoices_item0EntityList;
for (let i = 0;i<list2.arinvoices_item0EntityList.length;i++){
// list2.list0[i].invoiceCode;
// debugger
// this.dataForm.arinvoices_item0List[i].invoiceCode = list2.list0[i].invoiceCode;
// debugger
this.dataForm.arinvoices_item0List[i].attachMent = JSON.parse(list2.list0[i].attachMent);
this.dataForm.arinvoices_item0List[i].attachMent = JSON.parse(list2.arinvoices_item0EntityList[i].attachMent);
}
this.$store.commit('generator/UPDATE_RELATION_DATA', {})
@ -661,7 +661,9 @@
}
for(let i=0;i<_dataAll.arinvoices_item0List.length;i++){
var _list = _dataAll.arinvoices_item0List[i];
debugger
_list.attachMent = JSON.parse(_list.attachMent)
debugger
}
this.dataForm = _dataAll
},

Write Preview
Loading…
Cancel
Save