diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/entity/Arinvoices_item0Entity.java b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/entity/Arinvoices_item0Entity.java index 1fde4c18..21a10de5 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/entity/Arinvoices_item0Entity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/entity/Arinvoices_item0Entity.java @@ -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; + } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/Arinvoices_item0Model.java b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/Arinvoices_item0Model.java index 1fec9b0e..973e0c97 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/Arinvoices_item0Model.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/Arinvoices_item0Model.java @@ -66,4 +66,8 @@ public class Arinvoices_item0Model { @JsonProperty("materialName") private String materialName; + /** 开票人 **/ + @JsonProperty("arinvoicesUser") + private String arinvoicesUser; + } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/impl/Arinvoices_item0ServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/impl/Arinvoices_item0ServiceImpl.java index 49b1b487..37444cef 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/impl/Arinvoices_item0ServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/impl/Arinvoices_item0ServiceImpl.java @@ -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 importPreview(List 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> dataRow = new ArrayList<>(); List> columns = new ArrayList<>(); if(personList != null) { for (int i = 0; i < personList.size(); i++) { Map 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 paymentdocQueryWrapper=new QueryWrapper<>(); - paymentdocQueryWrapper.lambda().eq(PaymentdocEntity::getDocumentNo, paymentEntity.getPaymentno()); - List paymentdocList = paymentdocService.list(paymentdocQueryWrapper); - for (PaymentdocEntity paymentdocEntity : paymentdocList) { - //paymentdocEntity.setDocStatus("3"); - paymentdocEntity.setIsSubmit("0"); - paymentdocEntity.setPaymentAmount(paymentEntity.getPaymentamount().add(paymentdocEntity.getPaymentAmount()));//已付款金额 - paymentdocEntity.setUnpaymentAmount(paymentdocEntity.getRamount().subtract(paymentdocEntity.getPaymentAmount()));//未付款金额 - int i = paymentdocEntity.getPaymentAmount().compareTo(paymentdocEntity.getRamount()); - if (i == 1) { - return ActionResult.fail("付款金额过多，请先修改付款金额"); - } - if (i == 0) { - paymentdocEntity.setDocStatus("3"); - paymentdocEntity.setIsStop("1"); - List paymentdocItem0EntityList = paymentdocService.GetPaymentdocItem0List(paymentdocEntity.getId()); - for (PaymentdocItem0Entity paymentdocItem0Entity : paymentdocItem0EntityList) { - PurchaseorderitemEntity purchaseorderitemEntity = purchaseorderitemService.getById(paymentdocItem0Entity.getPurchaseorderId()); - purchaseorderitemEntity.setIsPayment("0"); - purchaseorderitemService.updateById(purchaseorderitemEntity); + String[] idList = paymentListVO.getId().split(","); + for (String ids : idList) { + PaymentEntity paymentEntity = paymentService.getById(ids); + paymentEntity.setStatus("1"); + paymentService.updateById(paymentEntity); + QueryWrapper paymentdocQueryWrapper = new QueryWrapper<>(); + paymentdocQueryWrapper.lambda().eq(PaymentdocEntity::getDocumentNo, paymentEntity.getPaymentno()); + List paymentdocList = paymentdocService.list(paymentdocQueryWrapper); + for (PaymentdocEntity paymentdocEntity : paymentdocList) { + //paymentdocEntity.setDocStatus("3"); + paymentdocEntity.setIsSubmit("0"); + paymentdocEntity.setPaymentAmount(paymentEntity.getPaymentamount().add(paymentdocEntity.getPaymentAmount()));//已付款金额 + paymentdocEntity.setUnpaymentAmount(paymentdocEntity.getRamount().subtract(paymentdocEntity.getPaymentAmount()));//未付款金额 + int i = paymentdocEntity.getPaymentAmount().compareTo(paymentdocEntity.getRamount()); + if (i == 1) { + return ActionResult.fail("付款金额过多，请先修改付款金额"); + } + if (i == 0) { + paymentdocEntity.setDocStatus("3"); + paymentdocEntity.setIsStop("1"); + List paymentdocItem0EntityList = paymentdocService.GetPaymentdocItem0List(paymentdocEntity.getId()); + for (PaymentdocItem0Entity paymentdocItem0Entity : paymentdocItem0EntityList) { + PurchaseorderitemEntity purchaseorderitemEntity = purchaseorderitemService.getById(paymentdocItem0Entity.getPurchaseorderId()); + purchaseorderitemEntity.setIsPayment("0"); + purchaseorderitemService.updateById(purchaseorderitemEntity); + } } + paymentdocService.updateById(paymentdocEntity); + } + List payment_item0EntityList = paymentService.GetPayment_item0List(paymentEntity.getId()); + for (Payment_item0Entity payment_item0Entity : payment_item0EntityList) { + PaymentdocItem0Entity paymentdocItem0Entity = paymentdoc_item0Service.getById(payment_item0Entity.getPaymentdocitemId()); + paymentdocItem0Entity.setPaymentAmount(paymentdocItem0Entity.getPaymentAmount().add(payment_item0Entity.getAmount())); + paymentdoc_item0Service.updateById(paymentdocItem0Entity); } - paymentdocService.updateById(paymentdocEntity); - } - List payment_item0EntityList = paymentService.GetPayment_item0List(paymentEntity.getId()); - for (Payment_item0Entity payment_item0Entity : payment_item0EntityList) { - PaymentdocItem0Entity paymentdocItem0Entity = paymentdoc_item0Service.getById(payment_item0Entity.getPaymentdocitemId()); - paymentdocItem0Entity.setPaymentAmount(paymentdocItem0Entity.getPaymentAmount().add(payment_item0Entity.getAmount())); - paymentdoc_item0Service.updateById(paymentdocItem0Entity); } - return ActionResult.success("提交成功"); + return ActionResult.success("提交成功"); } @PostMapping("/confirmprice") diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/entity/PoundlistEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/entity/PoundlistEntity.java index aa624774..12cc51c2 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/entity/PoundlistEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/entity/PoundlistEntity.java @@ -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; diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java index e009d2c2..bbfce0b2 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java @@ -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); } // diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java index a5e0db23..378a8d02 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java @@ -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()); diff --git a/SC-web/src/views/scm/basicInformation/arinvoices/Form.vue b/SC-web/src/views/scm/basicInformation/arinvoices/Form.vue index ecb95f5f..d1987f9f 100644 --- a/SC-web/src/views/scm/basicInformation/arinvoices/Form.vue +++ b/SC-web/src/views/scm/basicInformation/arinvoices/Form.vue @@ -289,7 +289,7 @@ @@ -649,7 +649,7 @@ taxAmount:undefined, amountNotTax:undefined, invoiceStatus:'0', - creatorUserName:undefined, + arinvoicesUser:undefined, invoiceDate:new Date().getTime(), attachMent:[], } diff --git a/SC-web/src/views/scm/basicInformation/invoices/Form.vue b/SC-web/src/views/scm/basicInformation/invoices/Form.vue index 22d57f54..26074ca8 100644 --- a/SC-web/src/views/scm/basicInformation/invoices/Form.vue +++ b/SC-web/src/views/scm/basicInformation/invoices/Form.vue @@ -299,7 +299,7 @@ @@ -784,7 +784,7 @@ taxAmount: undefined, amountNotTax: undefined, invoiceStatus: undefined, - creatorUserName: undefined, + invoicesUser: undefined, invoicingDate: undefined, invoiceAttachment:undefined, } diff --git a/SC-web/src/views/scm/basicInformation/payment/index.vue b/SC-web/src/views/scm/basicInformation/payment/index.vue index 60228da5..c46c1678 100644 --- a/SC-web/src/views/scm/basicInformation/payment/index.vue +++ b/SC-web/src/views/scm/basicInformation/payment/index.vue @@ -1,5 +1,6 @@