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

发票上传优化

Browse Source
product
杨世强 2 years ago
parent 21a40e56fb
commit fad2c01f85
17 changed files with 147 additions and 50 deletions
Show Stats Download Patch File Download Diff File

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

@ -12,6 +12,8 @@ import java.math.BigDecimal;
import java.math.BigDecimal;
import com.fasterxml.jackson.annotation.JsonProperty;
import javax.validation.constraints.Pattern;
/**
*
@ -100,10 +102,15 @@ public class Arinvoices_item0Entity {
@TableField("ATTACH_MENT")
private String attachMent;
@Excel(name = "开票日期")
// @Excel(name = "开票日期")
@TableField("INVOICE_DATE")
private Date invoiceDate;
@Excel(name = "开票日期",type = 1)
// @Pattern(regexp = "^(((\\d{2}(([02468][048])|([13579][26]))[\\-]((((0?[13578])|(1[02]))[\\-]((0?[1-9])|([1-2][0-9])|(3[01])))|(((0?[469])|(11))[\\-]((0?[1-9])|([1-2][0-9])|(30)))|(0?2[\\-]((0?[1-9])|([1-2][0-9])))))|(\\d{2}(([02468][1235679])|([13579][01345789]))[\\-]((((0?[13578])|(1[02]))[\\-]((0?[1-9])|([1-2][0-9])|(3[01])))|(((0?[469])|(11))[\\-]((0?[1-9])|([1-2][0-9])|(30)))|(0?2[\\-]((0?[1-9])|(1[0-9])|(2[0-8])))))))",message = "日期格式错误")
@TableField(exist = false)
private String invoiceDateStr;
@TableField("REMARK")
private String remark;
@ -117,4 +124,8 @@ public class Arinvoices_item0Entity {
@TableField("MATERIAL_NAME")
private String materialName;
@Excel(name = "开票人")
@TableField("ARINVOICES_USER")
private String arinvoicesUser;
}

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

@ -66,4 +66,8 @@ public class Arinvoices_item0Model {
@JsonProperty("materialName")
private String materialName;
/** 开票人 **/
@JsonProperty("arinvoicesUser")
private String arinvoicesUser;
}

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

@ -23,6 +23,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import jnpf.util.*;
import java.util.*;
@ -41,12 +43,67 @@ public class Arinvoices_item0ServiceImpl extends ServiceImpl<Arinvoices_item0Map
@Override
public Map<String, Object> importPreview(List<Arinvoices_item0Entity> personList) {
SimpleDateFormat format=new SimpleDateFormat("yyyy-MM-dd");
SimpleDateFormat format2=new SimpleDateFormat("yyyy-M-d");
SimpleDateFormat format3=new SimpleDateFormat("yyyy/MM/dd");
SimpleDateFormat format4=new SimpleDateFormat("yyyy/M/d");
SimpleDateFormat sim1 = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy", Locale.US);
List<Map<String, Object>> dataRow = new ArrayList<>();
List<Map<String, Object>> columns = new ArrayList<>();
if(personList != null) {
for (int i = 0; i < personList.size(); i++) {
Map<String, Object> dataRowMap = new HashMap<>();
Arinvoices_item0Entity model = personList.get(i);
boolean flag = false;
if (model.getInvoiceDateStr()!=null) {
String dateStr = model.getInvoiceDateStr();
try {
Date date = format.parse(dateStr);
dataRowMap.put("invoiceDate", date);
flag = true;
} catch (ParseException e) {
dataRowMap.put("invoiceDate", null);
}
if (!flag) {
try {
Date date = format2.parse(dateStr);
dataRowMap.put("invoiceDate", date);
flag = true;
} catch (ParseException e) {
dataRowMap.put("invoiceDate", null);
}
}
if (!flag) {
try {
Date date = format3.parse(dateStr);
dataRowMap.put("invoiceDate", date);
flag = true;
} catch (ParseException e) {
dataRowMap.put("invoiceDate", null);
}
}
if (!flag) {
try {
Date date = format4.parse(dateStr);
dataRowMap.put("invoiceDate", date);
flag = true;
} catch (ParseException e) {
dataRowMap.put("invoiceDate", null);
}
}
}
if (!flag){
if (model.getInvoiceDateStr()!=null) {
try {
Date newDate = sim1.parse(model.getInvoiceDateStr());
dataRowMap.put("invoiceDate", newDate);
} catch (ParseException e) {
e.printStackTrace();
}
// String newDateStr = model.getInvoiceDateStr().replace("\"","");
// dataRowMap.put("invoiceDate", new);
}
}
dataRowMap.put("materialName", model.getMaterialName());
dataRowMap.put("invoiceCode", model.getInvoiceCode());
dataRowMap.put("invoiceNo", model.getInvoiceNo());
@ -56,8 +113,8 @@ public class Arinvoices_item0ServiceImpl extends ServiceImpl<Arinvoices_item0Map
dataRowMap.put("taxAmount", model.getTaxAmount());
dataRowMap.put("amountNotTax", model.getAmountNotTax());
dataRowMap.put("invoiceStatus", model.getInvoiceStatus());
dataRowMap.put("creatorUserName", model.getCreatorUserName());
dataRowMap.put("invoiceDate", model.getInvoiceDate());
dataRowMap.put("arinvoicesUser", model.getArinvoicesUser());
dataRowMap.put("invoicesDate", model.getInvoiceDate());
dataRow.add(dataRowMap);
}
for (int i = 1; i < 12; i++) {

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

@ -115,4 +115,8 @@ public class InvoicesItem0Entity {
@TableField("PURCHASEORDER_ID")
private String purchaseorderId;
@Excel(name = "开票人")
@TableField("INVOICES_USER")
private String invoicesUser;
}

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

@ -65,4 +65,8 @@ public class InvoicesItem0Model {
/** 发票附件 **/
@JsonProperty("invoiceAttachment")
private String invoiceAttachment;
/** 开票人 **/
@JsonProperty("invoicesUser")
private String invoicesUser;
}

2
SC-boot/linkage-scm/src/main/java/jnpf/invoices/service/impl/InvoicesItem0ServiceImpl.java
Unescape View File

@ -60,7 +60,7 @@ public class InvoicesItem0ServiceImpl extends ServiceImpl<InvoicesItem0Mapper, I
dataRowMap.put("taxAmount", model.getTaxAmount());
dataRowMap.put("amountNotTax", model.getInvoiceAmount());
dataRowMap.put("invoiceStatus", "0");
dataRowMap.put("creatorUserName", model.getCreatorUserName());
dataRowMap.put("invoicesUser", model.getInvoicesUser());
dataRowMap.put("invoicingDate", model.getInvoicingDate());
dataRow.add(dataRowMap);
}

5
SC-boot/linkage-scm/src/main/java/jnpf/payment/controller/PaymentController.java
Unescape View File

@ -118,7 +118,9 @@ public class PaymentController {
@PostMapping("/submitprice")
@Transactional
public ActionResult submitprice(@RequestBody PaymentListVO paymentListVO) {
PaymentEntity paymentEntity = paymentService.getById(paymentListVO.getId());
String[] idList = paymentListVO.getId().split(",");
for (String ids : idList) {
PaymentEntity paymentEntity = paymentService.getById(ids);
paymentEntity.setStatus("1");
paymentService.updateById(paymentEntity);
QueryWrapper<PaymentdocEntity> paymentdocQueryWrapper = new QueryWrapper<>();
@ -151,6 +153,7 @@ public class PaymentController {
paymentdocItem0Entity.setPaymentAmount(paymentdocItem0Entity.getPaymentAmount().add(payment_item0Entity.getAmount()));
paymentdoc_item0Service.updateById(paymentdocItem0Entity);
}
}
return ActionResult.success("提交成功");
}

6
SC-boot/linkage-scm/src/main/java/jnpf/poundlist/entity/PoundlistEntity.java
Unescape View File

@ -194,6 +194,12 @@ public class PoundlistEntity {
@TableField("IS_EXPENSE")
private String isExpense;
@TableField("PURCHASEORDER_ID")
private String purchaseorderId;
@TableField("SALESORDER_ID")
private String salesorderId;
@TableField(exist = false)
private String materialName;

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

@ -268,6 +268,7 @@ public class PurchaseorderController {
poundlistEntity.setSettlement(entitys.getSettlement());
poundlistEntity.setPurchasePrice(entitys.getPrice());
poundlistEntity.setPurchaseStatus("0");
poundlistEntity.setPurchaseorderId(entity.getId());
poundlistService.updateById(poundlistEntity);
}
//

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

@ -548,6 +548,7 @@ public class SaleorderitemController {
PoundlistEntity poundlistEntity = poundlistService.getInfo(entitys.getPoundlistId());
poundlistEntity.setSalesStatus("0");
poundlistEntity.setSalesPrice(entitys.getUnitPrice());
poundlistEntity.setSalesorderId(entity.getId());
poundlistService.updateById(poundlistEntity);
}
entitys.setId(RandomUtil.uuId());

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

@ -289,7 +289,7 @@
</el-table-column>
<el-table-column prop="creatorUserName" label="开票人" align="center" width="130">
<template slot-scope="scope">
<el-input v-model="scope.row.creatorUserName"
<el-input v-model="scope.row.arinvoicesUser"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template>
@ -649,7 +649,7 @@
taxAmount:undefined,
amountNotTax:undefined,
invoiceStatus:'0',
creatorUserName:undefined,
arinvoicesUser:undefined,
invoiceDate:new Date().getTime(),
attachMent:[],
}

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

@ -299,7 +299,7 @@
</el-table-column>
<el-table-column prop="creatorUserName" label="开票人" width="200">
<template slot-scope="scope">
<el-input v-model="scope.row.creatorUserName" placeholder="请输入" clearable
<el-input v-model="scope.row.invoicesUser" placeholder="请输入" clearable
:style='{"width":"100%"}'>
</el-input>
</template>
@ -784,7 +784,7 @@
taxAmount: undefined,
amountNotTax: undefined,
invoiceStatus: undefined,
creatorUserName: undefined,
invoicesUser: undefined,
invoicingDate: undefined,
invoiceAttachment:undefined,
}

5
SC-web/src/views/scm/basicInformation/payment/index.vue
Unescape View File

@ -1,5 +1,6 @@
<template>
<div class="JNPF-common-layout">
<div class="JNPF-common-layout-center">
<el-row class="JNPF-common-search-box" :gutter="16">
<el-form @submit.native.prevent>
@ -676,8 +677,10 @@ export default {
});
return;
}
const ids = this.multipleSelection.join()
let param = {};
param.id = this.multipleSelectionItem[0].id;
// param.id= this.multipleSelectionItem[0].id;
param.id= ids;
request({
url: `/api/payment/Payment/submitprice`,
method: "POST",

4
SC-web/src/views/scm/basicInformation/purchaseorder/ImportForm.vue
Unescape View File

@ -83,7 +83,7 @@
</el-table-column> -->
<el-table-column prop="creatorUserName" label="开票人" width="150">
<template slot-scope="scope">
<el-input v-model="scope.row.creatorUserName" />
<el-input v-model="scope.row.invoicesUser" />
</template>
</el-table-column>
<el-table-column prop="invoicingDate" label="开票日期" width="150">
@ -131,7 +131,7 @@
<el-table-column prop="taxAmount" label="税额" width="150" />
<el-table-column prop="amountNotTax" label="不含税金额" width="100" />
<!-- <el-table-column prop="invoiceStatus" label="发票状态" width="100" /> -->
<el-table-column prop="creatorUserName" label="开票人" width="100" />
<el-table-column prop="invoicesUser" label="开票人" width="100" />
<el-table-column prop="invoicingDate" label="开票日期" width="100" />
</JNPF-table>
</div>

4
SC-web/src/views/scm/basicInformation/purchaseorder/InvoicesForm.vue
Unescape View File

@ -269,7 +269,7 @@
</el-table-column>
<el-table-column prop="creatorUserName" label="开票人" width="200">
<template slot-scope="scope">
<el-input v-model="scope.row.creatorUserName" placeholder="请输入" clearable
<el-input v-model="scope.row.invoicesUser" placeholder="请输入" clearable
:style='{"width":"100%"}'>
</el-input>
</template>
@ -773,7 +773,7 @@
taxAmount: 0,
amountNotTax: 0,
invoiceStatus: '0',
creatorUserName: undefined,
invoicesUser: undefined,
invoicingDate: new Date().getTime(),
invoiceAttachment: [],
}

11
SC-web/src/views/scm/basicInformation/saleorder/ImportForm.vue
Unescape View File

@ -83,12 +83,15 @@
</el-table-column>
<el-table-column prop="creatorUserName" label="开票人" width="150">
<template slot-scope="scope">
<el-input v-model="scope.row.creatorUserName" />
<el-input v-model="scope.row.arinvoicesUser" />
</template>
</el-table-column>
<el-table-column prop="invoiceDate" label="开票日期" width="150">
<el-table-column prop="invoiceDate" label="开票日期" width="160">
<template slot-scope="scope">
<el-input v-model="scope.row.invoiceDate" />
<!-- <el-input v-model="scope.row.invoiceDate" />-->
<el-date-picker v-model="scope.row.invoiceDate"
placeholder="请选择" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp" >
</el-date-picker>
</template>
</el-table-column>
<el-table-column label="操作" width="50">
@ -131,7 +134,7 @@
<el-table-column prop="taxAmount" label="税额" width="150" />
<el-table-column prop="amountNotTax" label="不含税金额" width="100" />
<el-table-column prop="invoiceStatus" label="发票状态" width="100" />
<el-table-column prop="creatorUserName" label="开票人" width="100" />
<el-table-column prop="arinvoicesUser" label="开票人" width="100" />
<el-table-column prop="invoicingDate" label="开票日期" width="100" />
</JNPF-table>
</div>

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

@ -301,7 +301,7 @@
</el-table-column>
<el-table-column prop="creatorUserName" label="开票人" align="center" width="130">
<template slot-scope="scope">
<el-input v-model="scope.row.creatorUserName"
<el-input v-model="scope.row.arinvoicesUser"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template>
@ -685,7 +685,7 @@
taxAmount:undefined,
amountNotTax:undefined,
invoiceStatus:'0',
creatorUserName:undefined,
arinvoicesUser:undefined,
invoiceDate:new Date().getTime(),
attachMent:[],
}

Write Preview
Loading…
Cancel
Save