From 58b483bc4e17500c6702037c3b4d52aa3905c12d Mon Sep 17 00:00:00 2001 From: xiaoyu <316612174@qq.com> Date: Mon, 7 Apr 2025 16:23:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=8F=B0=E8=B4=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gss/DhcOrderLedgerController.java | 11 +- .../gss/DhcProductInfoController.java | 23 +- .../com/ruoyi/gss/domain/DhcProductInfo.java | 199 ++++- .../ruoyi/system/domain/DhcOrderLedger.java | 795 ++++++++++++++++++ .../system/mapper/DhcOrderLedgerMapper.java | 8 + .../service/IDhcOrderLedgerService.java | 8 + .../impl/DhcOrderLedgerServiceImpl.java | 5 + .../mapper/system/DhcOrderLedgerMapper.xml | 196 ++++- 8 files changed, 1216 insertions(+), 29 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/gss/DhcOrderLedgerController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/gss/DhcOrderLedgerController.java index b45b3a8..99c87ff 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/gss/DhcOrderLedgerController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/gss/DhcOrderLedgerController.java @@ -5,7 +5,9 @@ import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.text.Convert; import com.ruoyi.system.domain.DhcOrderLedger; import com.ruoyi.system.service.IDhcOrderLedgerService; import org.springframework.beans.factory.annotation.Autowired; @@ -32,8 +34,13 @@ public class DhcOrderLedgerController extends BaseController { @PreAuthorize("@ss.hasPermi('gss:orderLedger:export')") @Log(title = "订单台账", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, DhcOrderLedger dhcOrderLedger) { - List list = dhcOrderLedgerService.selectDhcOrderLedgerList(dhcOrderLedger); + public void export(HttpServletResponse response, DhcOrderLedger dhcOrderLedger, String ids) { + List list; + if (StringUtils.isNotEmpty(ids)) { + list = dhcOrderLedgerService.selectDhcOrderLedgerByIds(Convert.toLongArray(ids)); + } else { + list = dhcOrderLedgerService.selectDhcOrderLedgerList(dhcOrderLedger); + } ExcelUtil util = new ExcelUtil(DhcOrderLedger.class); util.exportExcel(response, list, "订单台账数据"); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/gss/DhcProductInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/gss/DhcProductInfoController.java index acf2c1b..5315f3f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/gss/DhcProductInfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/gss/DhcProductInfoController.java @@ -28,11 +28,14 @@ public class DhcProductInfoController extends BaseController { @PreAuthorize("@ss.hasPermi('gss:product:list')") @GetMapping("/list") public TableDataInfo list(DhcProductInfo dhcProductInfo) { - startPage(); + startPage(); // 这里已经开启了分页 List list = dhcProductInfoService.selectDhcProductInfoList(dhcProductInfo); - return getDataTable(list); + return getDataTable(list); // 这里已经处理了分页数据的返回 } + /** + * 导出产品列表 + */ @PreAuthorize("@ss.hasPermi('gss:product:export')") @Log(title = "产品管理", businessType = BusinessType.EXPORT) @GetMapping("/export") @@ -42,19 +45,32 @@ public class DhcProductInfoController extends BaseController { return util.exportExcel(list, "产品数据"); } + /** + * 获取产品详细信息 + */ @PreAuthorize("@ss.hasPermi('gss:product:query')") @GetMapping(value = "/{productId}") public AjaxResult getInfo(@PathVariable("productId") Long productId) { return success(dhcProductInfoService.selectDhcProductInfoById(productId)); } + /** + * 新增产品 + */ @PreAuthorize("@ss.hasPermi('gss:product:add')") @Log(title = "产品管理", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody DhcProductInfo dhcProductInfo) { + // 设置默认值 + dhcProductInfo.setProductStatus("0"); // 默认草稿状态 + dhcProductInfo.setSalesType("0"); // 默认内销 + dhcProductInfo.setDelFlag("0"); // 默认未删除 return toAjax(dhcProductInfoService.insertDhcProductInfo(dhcProductInfo)); } + /** + * 修改产品 + */ @PreAuthorize("@ss.hasPermi('gss:product:edit')") @Log(title = "产品管理", businessType = BusinessType.UPDATE) @PutMapping @@ -62,6 +78,9 @@ public class DhcProductInfoController extends BaseController { return toAjax(dhcProductInfoService.updateDhcProductInfo(dhcProductInfo)); } + /** + * 删除产品 + */ @PreAuthorize("@ss.hasPermi('gss:product:remove')") @Log(title = "产品管理", businessType = BusinessType.DELETE) @DeleteMapping("/{productIds}") diff --git a/ruoyi-system/src/main/java/com/ruoyi/gss/domain/DhcProductInfo.java b/ruoyi-system/src/main/java/com/ruoyi/gss/domain/DhcProductInfo.java index 58ed291..0d32742 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/gss/domain/DhcProductInfo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/gss/domain/DhcProductInfo.java @@ -2,48 +2,245 @@ package com.ruoyi.gss.domain; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; +import com.fasterxml.jackson.annotation.JsonIgnore; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; public class DhcProductInfo extends BaseEntity { private static final long serialVersionUID = 1L; + /** 产品ID */ @Excel(name = "产品ID") private Long productId; + /** 产品名称 */ @Excel(name = "产品名称") private String productName; + /** 产品编码 */ @Excel(name = "产品编码") private String productCode; + /** 所属大类编码 */ @Excel(name = "所属大类编码") private String categoryLarge; + /** 所属中类编码 */ @Excel(name = "所属中类编码") private String categoryMiddle; + /** 所属小类编码 */ @Excel(name = "所属小类编码") private String categorySmall; + /** 产品状态（0草稿 1在售 2下市 3冻结） */ @Excel(name = "产品状态", readConverterExp = "0=草稿,1=在售,2=下市,3=冻结") private String productStatus; + /** 品牌名称 */ @Excel(name = "品牌名称") private String brandName; + /** 品牌编码 */ @Excel(name = "品牌编码") private String brandCode; + /** 内外销标识（0内销 1外销 2内外销） */ @Excel(name = "内外销标识", readConverterExp = "0=内销,1=外销,2=内外销") private String salesType; + /** 产品描述 */ @Excel(name = "产品描述") private String description; + /** 扩展属性（JSON格式） */ private String extProperties; + /** 删除标志（0代表存在 1代表删除） */ private String delFlag; - // getter/setter方法省略... + // 补充查询条件字段 + /** 产品状态数组，用于批量查询 */ + private String[] productStatuses; + + /** 内外销标识数组，用于批量查询 */ + private String[] salesTypes; + + /** 分类编码数组，用于批量查询 */ + private String[] categoryLarges; + private String[] categoryMiddles; + private String[] categorySmalls; + + /** 创建时间范围 */ + @JsonIgnore + private String[] createTimes; + + // 补充业务方法 + public boolean isEditable() { + return "0".equals(this.productStatus); // 只有草稿状态可编辑 + } + + public boolean isDeletable() { + return "0".equals(this.productStatus); // 只有草稿状态可删除 + } + + public boolean canChangeStatus(String targetStatus) { + // 状态流转规则： + // 草稿(0) -> 在售(1) + // 在售(1) -> 下市(2)或冻结(3) + // 下市(2)或冻结(3) -> 在售(1) + if ("0".equals(this.productStatus)) { + return "1".equals(targetStatus); + } else if ("1".equals(this.productStatus)) { + return "2".equals(targetStatus) || "3".equals(targetStatus); + } else if ("2".equals(this.productStatus) || "3".equals(targetStatus)) { + return "1".equals(targetStatus); + } + return false; + } + + public Long getProductId() { + return productId; + } + + public void setProductId(Long productId) { + this.productId = productId; + } + + public String getProductName() { + return productName; + } + + public void setProductName(String productName) { + this.productName = productName; + } + + public String getProductCode() { + return productCode; + } + + public void setProductCode(String productCode) { + this.productCode = productCode; + } + + public String getCategoryLarge() { + return categoryLarge; + } + + public void setCategoryLarge(String categoryLarge) { + this.categoryLarge = categoryLarge; + } + + public String getCategoryMiddle() { + return categoryMiddle; + } + + public void setCategoryMiddle(String categoryMiddle) { + this.categoryMiddle = categoryMiddle; + } + + public String getCategorySmall() { + return categorySmall; + } + + public void setCategorySmall(String categorySmall) { + this.categorySmall = categorySmall; + } + + public String getProductStatus() { + return productStatus; + } + + public void setProductStatus(String productStatus) { + this.productStatus = productStatus; + } + + public String getBrandName() { + return brandName; + } + + public void setBrandName(String brandName) { + this.brandName = brandName; + } + + public String getBrandCode() { + return brandCode; + } + + public void setBrandCode(String brandCode) { + this.brandCode = brandCode; + } + + public String getSalesType() { + return salesType; + } + + public void setSalesType(String salesType) { + this.salesType = salesType; + } + + public String getExtProperties() { + return extProperties; + } + + public void setExtProperties(String extProperties) { + this.extProperties = extProperties; + } + + public String getDelFlag() { + return delFlag; + } + + public void setDelFlag(String delFlag) { + this.delFlag = delFlag; + } + + // 新增的getter/setter方法 + public String[] getProductStatuses() { + return productStatuses; + } + + public void setProductStatuses(String[] productStatuses) { + this.productStatuses = productStatuses; + } + + public String[] getSalesTypes() { + return salesTypes; + } + + public void setSalesTypes(String[] salesTypes) { + this.salesTypes = salesTypes; + } + + public String[] getCategoryLarges() { + return categoryLarges; + } + + public void setCategoryLarges(String[] categoryLarges) { + this.categoryLarges = categoryLarges; + } + + public String[] getCategoryMiddles() { + return categoryMiddles; + } + + public void setCategoryMiddles(String[] categoryMiddles) { + this.categoryMiddles = categoryMiddles; + } + + public String[] getCategorySmalls() { + return categorySmalls; + } + + public void setCategorySmalls(String[] categorySmalls) { + this.categorySmalls = categorySmalls; + } + + public String[] getCreateTimes() { + return createTimes; + } + + public void setCreateTimes(String[] createTimes) { + this.createTimes = createTimes; + } } \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/DhcOrderLedger.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/DhcOrderLedger.java index 2242a1f..6abe7fd 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/DhcOrderLedger.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/DhcOrderLedger.java @@ -34,6 +34,534 @@ public class DhcOrderLedger extends BaseEntity { @Excel(name = "订单状态编码") private String orderStatusCode; + public String getShipPortName() { + return shipPortName; + } + + public void setShipPortName(String shipPortName) { + this.shipPortName = shipPortName; + } + + public String getTradeTerms() { + return tradeTerms; + } + + public void setTradeTerms(String tradeTerms) { + this.tradeTerms = tradeTerms; + } + + public BigDecimal getFobUnitPrice() { + return fobUnitPrice; + } + + public void setFobUnitPrice(BigDecimal fobUnitPrice) { + this.fobUnitPrice = fobUnitPrice; + } + + public BigDecimal getFobPrice() { + return fobPrice; + } + + public void setFobPrice(BigDecimal fobPrice) { + this.fobPrice = fobPrice; + } + + public BigDecimal getCifUnitPrice() { + return cifUnitPrice; + } + + public void setCifUnitPrice(BigDecimal cifUnitPrice) { + this.cifUnitPrice = cifUnitPrice; + } + + public BigDecimal getCifPrice() { + return cifPrice; + } + + public void setCifPrice(BigDecimal cifPrice) { + this.cifPrice = cifPrice; + } + + public BigDecimal getMovePrice() { + return movePrice; + } + + public void setMovePrice(BigDecimal movePrice) { + this.movePrice = movePrice; + } + + public BigDecimal getPremium() { + return premium; + } + + public void setPremium(BigDecimal premium) { + this.premium = premium; + } + + public BigDecimal getCgUnitPrice() { + return cgUnitPrice; + } + + public void setCgUnitPrice(BigDecimal cgUnitPrice) { + this.cgUnitPrice = cgUnitPrice; + } + + public BigDecimal getCgPrice() { + return cgPrice; + } + + public void setCgPrice(BigDecimal cgPrice) { + this.cgPrice = cgPrice; + } + + public BigDecimal getPoPrice() { + return poPrice; + } + + public void setPoPrice(BigDecimal poPrice) { + this.poPrice = poPrice; + } + + public BigDecimal getExwUnitPrice() { + return exwUnitPrice; + } + + public void setExwUnitPrice(BigDecimal exwUnitPrice) { + this.exwUnitPrice = exwUnitPrice; + } + + public BigDecimal getActualInvoicedAmount() { + return actualInvoicedAmount; + } + + public void setActualInvoicedAmount(BigDecimal actualInvoicedAmount) { + this.actualInvoicedAmount = actualInvoicedAmount; + } + + public BigDecimal getHongKongInvoicePrice() { + return hongKongInvoicePrice; + } + + public void setHongKongInvoicePrice(BigDecimal hongKongInvoicePrice) { + this.hongKongInvoicePrice = hongKongInvoicePrice; + } + + public BigDecimal getHongKongPrice() { + return hongKongPrice; + } + + public void setHongKongPrice(BigDecimal hongKongPrice) { + this.hongKongPrice = hongKongPrice; + } + + public String getProductSize() { + return productSize; + } + + public void setProductSize(String productSize) { + this.productSize = productSize; + } + + public String getCompletemachCode() { + return completemachCode; + } + + public void setCompletemachCode(String completemachCode) { + this.completemachCode = completemachCode; + } + + public String getNewMaterialCode() { + return newMaterialCode; + } + + public void setNewMaterialCode(String newMaterialCode) { + this.newMaterialCode = newMaterialCode; + } + + public String getContractNo() { + return contractNo; + } + + public void setContractNo(String contractNo) { + this.contractNo = contractNo; + } + + public String getCustomerModel() { + return customerModel; + } + + public void setCustomerModel(String customerModel) { + this.customerModel = customerModel; + } + + public String getScreenCode() { + return screenCode; + } + + public void setScreenCode(String screenCode) { + this.screenCode = screenCode; + } + + public String getProductionBaseName() { + return productionBaseName; + } + + public void setProductionBaseName(String productionBaseName) { + this.productionBaseName = productionBaseName; + } + + public String getPackWayName() { + return packWayName; + } + + public void setPackWayName(String packWayName) { + this.packWayName = packWayName; + } + + public String getOrderType() { + return orderType; + } + + public void setOrderType(String orderType) { + this.orderType = orderType; + } + + public String getDestnPortName() { + return destnPortName; + } + + public void setDestnPortName(String destnPortName) { + this.destnPortName = destnPortName; + } + + public String getAirLine() { + return airLine; + } + + public void setAirLine(String airLine) { + this.airLine = airLine; + } + + public String getShipCompany() { + return shipCompany; + } + + public void setShipCompany(String shipCompany) { + this.shipCompany = shipCompany; + } + + public String getSoNo() { + return soNo; + } + + public void setSoNo(String soNo) { + this.soNo = soNo; + } + + public Date getOrdplanDate() { + return ordplanDate; + } + + public void setOrdplanDate(Date ordplanDate) { + this.ordplanDate = ordplanDate; + } + + public Date getFormalPlanDeliveryDate() { + return formalPlanDeliveryDate; + } + + public void setFormalPlanDeliveryDate(Date formalPlanDeliveryDate) { + this.formalPlanDeliveryDate = formalPlanDeliveryDate; + } + + public Integer getFormalPlanQty() { + return formalPlanQty; + } + + public void setFormalPlanQty(Integer formalPlanQty) { + this.formalPlanQty = formalPlanQty; + } + + public Integer getCurrentInventory() { + return currentInventory; + } + + public void setCurrentInventory(Integer currentInventory) { + this.currentInventory = currentInventory; + } + + public Integer getDeliveryDateDiff() { + return deliveryDateDiff; + } + + public void setDeliveryDateDiff(Integer deliveryDateDiff) { + this.deliveryDateDiff = deliveryDateDiff; + } + + public Integer getQtyDiff() { + return qtyDiff; + } + + public void setQtyDiff(Integer qtyDiff) { + this.qtyDiff = qtyDiff; + } + + public Date getPlanEtd() { + return planEtd; + } + + public void setPlanEtd(Date planEtd) { + this.planEtd = planEtd; + } + + public Date getPlanEta() { + return planEta; + } + + public void setPlanEta(Date planEta) { + this.planEta = planEta; + } + + public String getPlanEtdWeekday() { + return planEtdWeekday; + } + + public void setPlanEtdWeekday(String planEtdWeekday) { + this.planEtdWeekday = planEtdWeekday; + } + + public Date getLhzEtd() { + return lhzEtd; + } + + public void setLhzEtd(Date lhzEtd) { + this.lhzEtd = lhzEtd; + } + + public Date getDcEtd() { + return dcEtd; + } + + public void setDcEtd(Date dcEtd) { + this.dcEtd = dcEtd; + } + + public Date getEtdActualTime() { + return etdActualTime; + } + + public void setEtdActualTime(Date etdActualTime) { + this.etdActualTime = etdActualTime; + } + + public Date getEtaActualTime() { + return etaActualTime; + } + + public void setEtaActualTime(Date etaActualTime) { + this.etaActualTime = etaActualTime; + } + + public Integer getEtaDifference() { + return etaDifference; + } + + public void setEtaDifference(Integer etaDifference) { + this.etaDifference = etaDifference; + } + + public String getSpecialRemark() { + return specialRemark; + } + + public void setSpecialRemark(String specialRemark) { + this.specialRemark = specialRemark; + } + + public Date getAtd() { + return atd; + } + + public void setAtd(Date atd) { + this.atd = atd; + } + + public Date getAta() { + return ata; + } + + public void setAta(Date ata) { + this.ata = ata; + } + + public Date getZtdDate() { + return ztdDate; + } + + public void setZtdDate(Date ztdDate) { + this.ztdDate = ztdDate; + } + + public String getIsInspection() { + return isInspection; + } + + public void setIsInspection(String isInspection) { + this.isInspection = isInspection; + } + + public String getSalesAssistantName() { + return salesAssistantName; + } + + public void setSalesAssistantName(String salesAssistantName) { + this.salesAssistantName = salesAssistantName; + } + + public String getLogisticsPersonnel() { + return logisticsPersonnel; + } + + public void setLogisticsPersonnel(String logisticsPersonnel) { + this.logisticsPersonnel = logisticsPersonnel; + } + + public String getLhzStatusName() { + return lhzStatusName; + } + + public void setLhzStatusName(String lhzStatusName) { + this.lhzStatusName = lhzStatusName; + } + + public String getOrderEntryMonth() { + return orderEntryMonth; + } + + public void setOrderEntryMonth(String orderEntryMonth) { + this.orderEntryMonth = orderEntryMonth; + } + + public String getServiceType() { + return serviceType; + } + + public void setServiceType(String serviceType) { + this.serviceType = serviceType; + } + + public String getProductLineType() { + return productLineType; + } + + public void setProductLineType(String productLineType) { + this.productLineType = productLineType; + } + + public Integer getRkQty() { + return rkQty; + } + + public void setRkQty(Integer rkQty) { + this.rkQty = rkQty; + } + + public String getProductBigCategory() { + return productBigCategory; + } + + public void setProductBigCategory(String productBigCategory) { + this.productBigCategory = productBigCategory; + } + + public String getZeroRollPlanNumber() { + return zeroRollPlanNumber; + } + + public void setZeroRollPlanNumber(String zeroRollPlanNumber) { + this.zeroRollPlanNumber = zeroRollPlanNumber; + } + + public String getBoxType() { + return boxType; + } + + public void setBoxType(String boxType) { + this.boxType = boxType; + } + + public String getManuRemark() { + return manuRemark; + } + + public void setManuRemark(String manuRemark) { + this.manuRemark = manuRemark; + } + + public String getOverseasFactory() { + return overseasFactory; + } + + public void setOverseasFactory(String overseasFactory) { + this.overseasFactory = overseasFactory; + } + + public String getInProduction() { + return inProduction; + } + + public void setInProduction(String inProduction) { + this.inProduction = inProduction; + } + + public String getInStock() { + return inStock; + } + + public void setInStock(String inStock) { + this.inStock = inStock; + } + + public String getLoadedInContainer() { + return loadedInContainer; + } + + public void setLoadedInContainer(String loadedInContainer) { + this.loadedInContainer = loadedInContainer; + } + + public String getHasShipped() { + return hasShipped; + } + + public void setHasShipped(String hasShipped) { + this.hasShipped = hasShipped; + } + + public String getDeliveryStatus() { + return deliveryStatus; + } + + public void setDeliveryStatus(String deliveryStatus) { + this.deliveryStatus = deliveryStatus; + } + + public Integer getCustomsDeclarationNumber() { + return customsDeclarationNumber; + } + + public void setCustomsDeclarationNumber(Integer customsDeclarationNumber) { + this.customsDeclarationNumber = customsDeclarationNumber; + } + + public String getCustomsDeclarationReason() { + return customsDeclarationReason; + } + + public void setCustomsDeclarationReason(String customsDeclarationReason) { + this.customsDeclarationReason = customsDeclarationReason; + } + /** 订单状态名称 */ @Excel(name = "订单状态") private String orderStatusName; @@ -234,4 +762,271 @@ public class DhcOrderLedger extends BaseEntity { public void setBrandName(String brandName) { this.brandName = brandName; } + + /** 贸易条款 */ + @Excel(name = "贸易条款") + private String tradeTerms; + + /** FOB单价 */ + @Excel(name = "FOB单价") + private BigDecimal fobUnitPrice; + + /** FOB总金额 */ + @Excel(name = "FOB总金额") + private BigDecimal fobPrice; + + /** CIF单价 */ + @Excel(name = "CIF单价") + private BigDecimal cifUnitPrice; + + /** CIF总金额 */ + @Excel(name = "CIF总金额") + private BigDecimal cifPrice; + + /** 总运费 */ + @Excel(name = "总运费") + private BigDecimal movePrice; + + /** 总保费 */ + @Excel(name = "总保费") + private BigDecimal premium; + + /** 预估保值单价 */ + @Excel(name = "预估保值单价") + private BigDecimal cgUnitPrice; + + /** 预估保值总额 */ + @Excel(name = "预估保值总额") + private BigDecimal cgPrice; + + /** PO总金额 */ + @Excel(name = "PO总金额") + private BigDecimal poPrice; + + /** EXW单价 */ + @Excel(name = "EXW单价") + private BigDecimal exwUnitPrice; + + /** 实际开票金额 */ + @Excel(name = "实际开票金额") + private BigDecimal actualInvoicedAmount; + + /** 香港发票价格 */ + @Excel(name = "香港发票价格") + private BigDecimal hongKongInvoicePrice; + + /** 香港发票总金额 */ + @Excel(name = "香港发票总金额") + private BigDecimal hongKongPrice; + + /** 尺寸 */ + @Excel(name = "尺寸") + private String productSize; + + /** 整机编码 */ + @Excel(name = "整机编码") + private String completemachCode; + + /** 新物料号 */ + @Excel(name = "新物料号") + private String newMaterialCode; + + /** 合同号 */ + @Excel(name = "合同号") + private String contractNo; + + /** 销售型号 */ + @Excel(name = "销售型号") + private String customerModel; + + /** 屏型号 */ + @Excel(name = "屏型号") + private String screenCode; + + /** 生产基地 */ + @Excel(name = "生产基地") + private String productionBaseName; + + /** 包装方式 */ + @Excel(name = "包装方式") + private String packWayName; + + /** 订单类别 */ + @Excel(name = "订单类别") + private String orderType; + + /** 起运港 */ + @Excel(name = "起运港") + private String shipPortName; + + /** 目的港 */ + @Excel(name = "目的港") + private String destnPortName; + + /** 航线 */ + @Excel(name = "航线") + private String airLine; + + /** 船公司 */ + @Excel(name = "船公司") + private String shipCompany; + + /** SO号 */ + @Excel(name = "SO号") + private String soNo; + + /** 排产交货期 */ + @Excel(name = "排产交货期", dateFormat = "yyyy-MM-dd") + private Date ordplanDate; + + /** 正式版滚动计划交货期 */ + @Excel(name = "正式版滚动计划交货期", dateFormat = "yyyy-MM-dd") + private Date formalPlanDeliveryDate; + + /** 正式版滚动计划数量 */ + @Excel(name = "正式版滚动计划数量") + private Integer formalPlanQty; + + /** 当前库存数 */ + @Excel(name = "当前库存数") + private Integer currentInventory; + + /** GSS交货期与正式版交货期差异 */ + @Excel(name = "交货期差异") + private Integer deliveryDateDiff; + + /** GSS数量与正式版数量差异 */ + @Excel(name = "数量差异") + private Integer qtyDiff; + + /** ETD计划 */ + @Excel(name = "ETD计划", dateFormat = "yyyy-MM-dd") + private Date planEtd; + + /** ETA计划 */ + @Excel(name = "ETA计划", dateFormat = "yyyy-MM-dd") + private Date planEta; + + /** ETD Weekday（计划） */ + @Excel(name = "ETD Weekday") + private String planEtdWeekday; + + /** 落货纸ETD */ + @Excel(name = "落货纸ETD", dateFormat = "yyyy-MM-dd") + private Date lhzEtd; + + /** 订舱ETD */ + @Excel(name = "订舱ETD", dateFormat = "yyyy-MM-dd") + private Date dcEtd; + + /** ETD（实时） */ + @Excel(name = "ETD实时", dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date etdActualTime; + + /** ETA（实时） */ + @Excel(name = "ETA实时", dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date etaActualTime; + + /** ETA（差异） */ + @Excel(name = "ETA差异") + private Integer etaDifference; + + /** 特殊备注 */ + @Excel(name = "特殊备注") + private String specialRemark; + + /** ATD */ + @Excel(name = "ATD", dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date atd; + + /** ATA */ + @Excel(name = "ATA", dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date ata; + + /** 提单日期 */ + @Excel(name = "提单日期", dateFormat = "yyyy-MM-dd") + private Date ztdDate; + + /** 是否验货 */ + @Excel(name = "是否验货", readConverterExp = "0=否,1=是") + private String isInspection; + + /** 销售协调 */ + @Excel(name = "销售协调") + private String salesAssistantName; + + /** 物流人员 */ + @Excel(name = "物流人员") + private String logisticsPersonnel; + + /** 落货纸状态 */ + @Excel(name = "落货纸状态") + private String lhzStatusName; + + /** 报关月份 */ + @Excel(name = "报关月份") + private String orderEntryMonth; + + /** 是否执行零号 */ + @Excel(name = "是否执行零号", readConverterExp = "0=否,1=是") + private String serviceType; + + /** 产品线 */ + @Excel(name = "产品线") + private String productLineType; + + /** 累计入库数 */ + @Excel(name = "累计入库数") + private Integer rkQty; + + /** 产品大类 */ + @Excel(name = "产品大类") + private String productBigCategory; + + /** 零号滚动计划号 */ + @Excel(name = "零号滚动计划号") + private String zeroRollPlanNumber; + + /** 箱型箱量 */ + @Excel(name = "箱型箱量") + private String boxType; + + /** 手工备注 */ + @Excel(name = "手工备注") + private String manuRemark; + + /** 海外工厂 */ + @Excel(name = "海外工厂") + private String overseasFactory; + + /** 生产中 */ + @Excel(name = "生产中", readConverterExp = "0=否,1=是") + private String inProduction; + + /** 有库存 */ + @Excel(name = "有库存", readConverterExp = "0=否,1=是") + private String inStock; + + /** 已装柜 */ + @Excel(name = "已装柜", readConverterExp = "0=否,1=是") + private String loadedInContainer; + + /** 已出运 */ + @Excel(name = "已出运", readConverterExp = "0=否,1=是") + private String hasShipped; + + /** 交付状态 */ + @Excel(name = "交付状态") + private String deliveryStatus; + + /** 关单数量 */ + @Excel(name = "关单数量") + private Integer customsDeclarationNumber; + + /** 关单原因 */ + @Excel(name = "关单原因") + private String customsDeclarationReason; + + // 生成所有新增字段的getter和setter方法 + // ... 此处省略getter和setter方法，需要全部补充 ... } \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/DhcOrderLedgerMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/DhcOrderLedgerMapper.java index a626367..dc6d09d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/DhcOrderLedgerMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/DhcOrderLedgerMapper.java @@ -15,4 +15,12 @@ public interface DhcOrderLedgerMapper { public int deleteDhcOrderLedgerById(Long id); public int deleteDhcOrderLedgerByIds(Long[] ids); + + /** + * 根据ID数组查询订单台账列表 + * + * @param ids ID数组 + * @return 订单台账集合 + */ + public List selectDhcOrderLedgerByIds(Long[] ids); } \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IDhcOrderLedgerService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IDhcOrderLedgerService.java index ee6d5d2..8c57eb1 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IDhcOrderLedgerService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IDhcOrderLedgerService.java @@ -15,4 +15,12 @@ public interface IDhcOrderLedgerService { public int deleteDhcOrderLedgerByIds(Long[] ids); public int deleteDhcOrderLedgerById(Long id); + + /** + * 根据ID数组查询订单台账列表 + * + * @param ids ID数组 + * @return 订单台账集合 + */ + public List selectDhcOrderLedgerByIds(Long[] ids); } \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DhcOrderLedgerServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DhcOrderLedgerServiceImpl.java index b7884dd..9817bfa 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DhcOrderLedgerServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DhcOrderLedgerServiceImpl.java @@ -25,6 +25,11 @@ public class DhcOrderLedgerServiceImpl implements IDhcOrderLedgerService { return dhcOrderLedgerMapper.selectDhcOrderLedgerById(id); } + @Override + public List selectDhcOrderLedgerByIds(Long[] ids) { + return dhcOrderLedgerMapper.selectDhcOrderLedgerByIds(ids); + } + @Override public int insertDhcOrderLedger(DhcOrderLedger dhcOrderLedger) { dhcOrderLedger.setCreateTime(DateUtils.getNowDate()); diff --git a/ruoyi-system/src/main/resources/mapper/system/DhcOrderLedgerMapper.xml b/ruoyi-system/src/main/resources/mapper/system/DhcOrderLedgerMapper.xml index b031463..392c146 100644 --- a/ruoyi-system/src/main/resources/mapper/system/DhcOrderLedgerMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/DhcOrderLedgerMapper.xml @@ -6,50 +6,155 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - - + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + - select id, lhz_no, roll_plan_number, product_model, order_qty, no_product_num, product_num, - sales_area_code, sales_area_name, country_code, country_name, customer_name, real_customer, - brand_code, brand_name, create_by, create_time, update_by, update_time, remark + select id, lhz_no, roll_plan_number, product_model, order_qty, customer_name, + order_status_code, order_status_name, sales_area_code, sales_area_name, + country_code, country_name, real_customer, brand_code, brand_name, + ship_port_name, trade_terms, fob_unit_price, fob_price, cif_unit_price, + cif_price, move_price, premium, cg_unit_price, cg_price, po_price, + exw_unit_price, actual_invoiced_amount, hong_kong_invoice_price, hong_kong_price, + product_size, completemach_code, new_material_code, contract_no, customer_model, + screen_code, production_base_name, pack_way_name, order_type, destn_port_name, + air_line, ship_company, so_no, ordplan_date, formal_plan_delivery_date, + formal_plan_qty, current_inventory, delivery_date_diff, qty_diff, plan_etd, + plan_eta, plan_etd_weekday, lhz_etd, dc_etd, etd_actual_time, eta_actual_time, + eta_difference, special_remark, atd, ata, ztd_date, is_inspection, + sales_assistant_name, logistics_personnel, lhz_status_name, order_entry_month, + service_type, product_line_type, rk_qty, product_big_category, + zero_roll_plan_number, box_type, manu_remark, overseas_factory, + in_production, in_stock, loaded_in_container, has_shipped, delivery_status, + customs_declaration_number, customs_declaration_reason, + plan_delivery_date, plan_delivery_weekday, no_product_num, product_num, + create_by, create_time, update_by, update_time from dhc_order_ledger - + - - where id = #{id} + where id in + + #{id} + @@ -59,19 +164,49 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" roll_plan_number, product_model, order_qty, + customer_name, + order_status_code, + order_status_name, + sales_area_code, + sales_area_name, + country_code, + country_name, + real_customer, + brand_code, + brand_name, + plan_delivery_date, + plan_delivery_weekday, + no_product_num, + product_num, create_by, create_time, - remark, - + update_by, + update_time, + #{lhzNo}, #{rollPlanNumber}, #{productModel}, #{orderQty}, + #{customerName}, + #{orderStatusCode}, + #{orderStatusName}, + #{salesAreaCode}, + #{salesAreaName}, + #{countryCode}, + #{countryName}, + #{realCustomer}, + #{brandCode}, + #{brandName}, + #{planDeliveryDate}, + #{planDeliveryWeekday}, + #{noProductNum}, + #{productNum}, #{createBy}, #{createTime}, - #{remark}, - + #{updateBy}, + #{updateTime}, + @@ -81,9 +216,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" roll_plan_number = #{rollPlanNumber}, product_model = #{productModel}, order_qty = #{orderQty}, + customer_name = #{customerName}, + order_status_code = #{orderStatusCode}, + order_status_name = #{orderStatusName}, + sales_area_code = #{salesAreaCode}, + sales_area_name = #{salesAreaName}, + country_code = #{countryCode}, + country_name = #{countryName}, + real_customer = #{realCustomer}, + brand_code = #{brandCode}, + brand_name = #{brandName}, + plan_delivery_date = #{planDeliveryDate}, + plan_delivery_weekday = #{planDeliveryWeekday}, + no_product_num = #{noProductNum}, + product_num = #{productNum}, update_by = #{updateBy}, update_time = #{updateTime}, - remark = #{remark}, where id = #{id}