diff --git a/ruoyi-admin/src/main/java/com/ruoyi/manufacture/controller/WorkOrderInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/manufacture/controller/WorkOrderInfoController.java index 4016ff94..06c1eb9f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/manufacture/controller/WorkOrderInfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/manufacture/controller/WorkOrderInfoController.java @@ -7,7 +7,6 @@ import com.alibaba.excel.write.metadata.WriteSheet; import com.alibaba.excel.write.metadata.fill.FillConfig; import com.alibaba.excel.write.metadata.style.WriteCellStyle; import com.alibaba.excel.write.metadata.style.WriteFont; -import com.alibaba.fastjson.JSONObject; import com.ruoyi.ck.utils.Result; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; @@ -15,15 +14,15 @@ 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.poi.ExcelUtil; +import com.ruoyi.manufacture.domain.WorkOrderDetail; import com.ruoyi.manufacture.domain.WorkOrderInfo; import com.ruoyi.manufacture.domain.exportDto.WorkOrderDetailDto; -import com.ruoyi.purchase.domain.exportDto.PurchaseMaterialDto; -import com.ruoyi.system.utils.CellStyleStrategy; -import com.ruoyi.system.utils.ExcelFillCellMergePrevColUtils; -import com.ruoyi.manufacture.domain.WorkOrderDetail; import com.ruoyi.manufacture.domain.exportDto.WorkOrderInfoDto; import com.ruoyi.manufacture.service.IWorkOrderDetailService; import com.ruoyi.manufacture.service.IWorkOrderInfoService; +import com.ruoyi.purchase.domain.exportDto.PurchaseMaterialDto; +import com.ruoyi.system.utils.CellStyleStrategy; +import com.ruoyi.system.utils.ExcelFillCellMergePrevColUtils; import org.apache.poi.ss.usermodel.BorderStyle; import org.apache.poi.ss.usermodel.HorizontalAlignment; import org.apache.poi.ss.usermodel.VerticalAlignment; @@ -160,23 +159,23 @@ public class WorkOrderInfoController extends BaseController @RequiresPermissions("manufacture:workOrderInfo:remove") @Log(title = "制工单", businessType = BusinessType.DELETE) - @RequestMapping( "/removeSelectedOrder") + @RequestMapping( "/removeSelected") @ResponseBody - public String removeSelectedOrder(@RequestParam(value = "orderData") String orderData) { -// System.out.println(orderData); - List workOrderInfoList= JSONObject.parseArray(orderData, WorkOrderInfo.class); - - WorkOrderInfo workOrderInfo = workOrderInfoService.selectWorkOrderInfoById(workOrderInfoList.get(0).getWorkOrderId()); - System.out.println(workOrderInfo); - WorkOrderDetail workOrderDetail = new WorkOrderDetail(); - workOrderDetail.setWorkOrderNumber(workOrderInfo.getWorkOrderNumber()); - List WorkOrderDetail1 = workOrderDetailService.selectWorkOrderDetailList(workOrderDetail); - if (WorkOrderDetail1.size()>0) { - for (int i=0;i list = workOrderDetailService.selectWorkOrderDetailList(workOrderDetail); + if (list.size()>0) { + for (int j=0;j>>>>>异常<<<<<<", e); } System.out.println(detailDtoList); response.setCharacterEncoding("utf-8"); - String fileName = URLEncoder.encode("物料检验通知单", "UTF-8").replaceAll("\\+", "%20"); + String fileName = URLEncoder.encode("委外入库检验通知单", "UTF-8").replaceAll("\\+", "%20"); response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); String templateFileName = "C:\\exportTemplates\\exportOutsourceInspectionNotice.xlsx"; try (ExcelWriter excelWriter = EasyExcel .write(response.getOutputStream(), PurchaseMaterialDto.class) .withTemplate(templateFileName) - .registerWriteHandler(mergePrevColUtils) +// .registerWriteHandler(mergePrevColUtils) //样式注册 .registerWriteHandler(horizontalCellStyleStrategyBuilder()) .build()) { @@ -236,13 +260,8 @@ public class OutsourceInspectionNoticeController extends BaseController excelWriter.fill(detailDtoList, fillConfig, writeSheet); Map map = MapUtils.newHashMap(); // map.put("date", DateTimeFormatter.ofPattern("yyyy/MM/dd").format(LocalDateTime.now())); - map.put("outsourceOrderNumber", outsourceInspectionNoticeDto.getOutsourceOrderNumber()); - map.put("inNoticeNumber", outsourceInspectionNoticeDto.getInNoticeNumber()); map.put("supplierName", outsourceInspectionNoticeDto.getSupplierName()); - map.put("warehousingDate", outsourceInspectionNoticeDto.getWarehousingDate()); - map.put("stockName", outsourceInspectionNoticeDto.getStockName()); - map.put("processingType", outsourceInspectionNoticeDto.getProcessingType()); - map.put("receivingPersonnel", outsourceInspectionNoticeDto.getReceivingPersonnel()); + map.put("inspectionDate", outsourceInspectionNoticeDto.getInspectionDate().substring(0,10)); excelWriter.fill(map, writeSheet); } } @@ -251,8 +270,8 @@ public class OutsourceInspectionNoticeController extends BaseController WriteCellStyle headWriteCellStyle = new WriteCellStyle(); //设置头字体 WriteFont headWriteFont = new WriteFont(); - headWriteFont.setFontHeightInPoints((short) 13); - headWriteFont.setBold(true); +// headWriteFont.setFontHeightInPoints((short) 13); +// headWriteFont.setBold(true); headWriteCellStyle.setWriteFont(headWriteFont); //设置头居中 headWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER); @@ -263,10 +282,10 @@ public class OutsourceInspectionNoticeController extends BaseController //垂直居中 contentWriteCellStyle.setVerticalAlignment(VerticalAlignment.CENTER); //单元格边框 - contentWriteCellStyle.setBorderTop(BorderStyle.DASHED); - contentWriteCellStyle.setBorderLeft(BorderStyle.DASHED); - contentWriteCellStyle.setBorderRight(BorderStyle.DASHED); - contentWriteCellStyle.setBorderBottom(BorderStyle.DASHED); + contentWriteCellStyle.setBorderTop(BorderStyle.THIN); + contentWriteCellStyle.setBorderLeft(BorderStyle.THIN); + contentWriteCellStyle.setBorderRight(BorderStyle.THIN); + contentWriteCellStyle.setBorderBottom(BorderStyle.THIN); return new CellStyleStrategy(headWriteCellStyle, contentWriteCellStyle); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/outsource/domain/OutsourceOrderMaterial.java b/ruoyi-admin/src/main/java/com/ruoyi/outsource/domain/OutsourceOrderMaterial.java index d5b84051..d5842376 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/outsource/domain/OutsourceOrderMaterial.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/outsource/domain/OutsourceOrderMaterial.java @@ -22,6 +22,10 @@ public class OutsourceOrderMaterial extends BaseEntity @Excel(name = "委外加工订单单号") private String outsourceOrderNumber; + /** 工单号 */ + @Excel(name = "工单号") + private String outsourceWorkNumber; + /** 物料代码 */ @Excel(name = "物料代码") private String materialCode; @@ -89,7 +93,15 @@ public class OutsourceOrderMaterial extends BaseEntity this.outsourceOrderNumber = outsourceOrderNumber; } - public String getOutsourceOrderNumber() + public String getOutsourceWorkNumber() { + return outsourceWorkNumber; + } + + public void setOutsourceWorkNumber(String outsourceWorkNumber) { + this.outsourceWorkNumber = outsourceWorkNumber; + } + + public String getOutsourceOrderNumber() { return outsourceOrderNumber; } @@ -207,6 +219,7 @@ public class OutsourceOrderMaterial extends BaseEntity return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) .append("outsourceOrderMaterialId", getOutsourceOrderMaterialId()) .append("outsourceOrderNumber", getOutsourceOrderNumber()) + .append("outsourceWorkNumber", getOutsourceWorkNumber()) .append("materialCode", getMaterialCode()) .append("materialName", getMaterialName()) .append("specificationModel", getSpecificationModel()) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/purchase/controller/PurchaseAccountReconciliationController.java b/ruoyi-admin/src/main/java/com/ruoyi/purchase/controller/PurchaseAccountReconciliationController.java index ccab2a6d..019d8450 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/purchase/controller/PurchaseAccountReconciliationController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/purchase/controller/PurchaseAccountReconciliationController.java @@ -17,6 +17,7 @@ import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.purchase.domain.PurchaseAccountReconciliation; import com.ruoyi.purchase.domain.exportDto.PurchaseAccountReconciliationDto; import com.ruoyi.purchase.service.IPurchaseAccountReconciliationService; +import com.ruoyi.storehouse.utils.CustomRowWriteCellHandler; import com.ruoyi.system.utils.ExcelFillCellMergePrevColUtils; import org.apache.poi.ss.usermodel.HorizontalAlignment; import org.apache.poi.ss.usermodel.VerticalAlignment; @@ -31,10 +32,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.net.URLEncoder; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Map; +import java.util.*; import static com.ruoyi.common.config.datasource.DynamicDataSourceContextHolder.log; @@ -53,6 +51,8 @@ public class PurchaseAccountReconciliationController extends BaseController @Autowired private IPurchaseAccountReconciliationService purchaseAccountReconciliationService; + //excel数据量 + private Integer excelSize = 27; @RequiresPermissions("purchase:purchaseAccountReconciliation:view") @GetMapping() @@ -159,6 +159,8 @@ public class PurchaseAccountReconciliationController extends BaseController String supplierCodeNow = request.getParameter("supplierCode").trim(); String supplierNameNow = request.getParameter("supplierName").trim(); + String beginWarehousingDateNow = request.getParameter("beginWarehousingDate").trim(); + String endWarehousingDateNow = request.getParameter("endWarehousingDate").trim(); String[] idsStr = ids.split(","); // 创建列合并工具类对象 ExcelFillCellMergePrevColUtils mergePrevColUtils = new ExcelFillCellMergePrevColUtils(); @@ -175,14 +177,36 @@ public class PurchaseAccountReconciliationController extends BaseController Object source = values.next(); PurchaseAccountReconciliationDto target = PurchaseAccountReconciliationDto.class.newInstance(); BeanUtils.copyProperties(source, target); - mergePrevColUtils.add(number+6,4,1); - number++; +// mergePrevColUtils.add(number+6,4,1); +// number++; purchaseAccountReconciliationDtoList.add(target); } + int size = purchaseAccountReconciliationDtoList.size(); + if (purchaseAccountReconciliationDtoList.size()>>>>>异常<<<<<<", e); } + Map colMap = new HashMap<>(); + colMap.put(5, 6); + response.setCharacterEncoding("utf-8"); String fileName = URLEncoder.encode("采购对账订单", "UTF-8").replaceAll("\\+", "%20"); response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); @@ -190,9 +214,10 @@ public class PurchaseAccountReconciliationController extends BaseController try (ExcelWriter excelWriter = EasyExcel .write(response.getOutputStream(), PurchaseAccountReconciliationDto.class) .withTemplate(templateFileName) - .registerWriteHandler(mergePrevColUtils) +// .registerWriteHandler(mergePrevColUtils) + .registerWriteHandler(new CustomRowWriteCellHandler(colMap)) //样式注册 - .registerWriteHandler(horizontalCellStyleStrategyBuilder()) +// .registerWriteHandler(horizontalCellStyleStrategyBuilder()) .build()) { WriteSheet writeSheet = EasyExcel.writerSheet().build(); FillConfig fillConfig = FillConfig.builder().forceNewRow(Boolean.TRUE).build(); @@ -200,6 +225,8 @@ public class PurchaseAccountReconciliationController extends BaseController Map map = MapUtils.newHashMap(); map.put("supplierCode", supplierCodeNow); map.put("supplierName", supplierNameNow); + map.put("beginWarehousingDate", beginWarehousingDateNow); + map.put("endWarehousingDate", endWarehousingDateNow); excelWriter.fill(map, writeSheet); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/purchase/controller/PurchaseOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/purchase/controller/PurchaseOrderController.java index c1efbef4..4ebc6c95 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/purchase/controller/PurchaseOrderController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/purchase/controller/PurchaseOrderController.java @@ -21,8 +21,7 @@ import com.ruoyi.purchase.domain.exportDto.PurchaseMaterialDto; import com.ruoyi.purchase.domain.exportDto.PurchaseOrderDto; import com.ruoyi.purchase.service.IPurchaseMaterialService; import com.ruoyi.purchase.service.IPurchaseOrderService; -import com.ruoyi.storehouse.utils.CustomRowWriteHandler; -import com.ruoyi.system.utils.ExcelFillCellMergePrevColUtils; +import com.ruoyi.storehouse.utils.CustomRowWriteCellHandler; import org.apache.poi.ss.usermodel.HorizontalAlignment; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.BeanUtils; @@ -33,11 +32,7 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.net.URLEncoder; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Map; +import java.util.*; import static com.ruoyi.common.config.datasource.DynamicDataSourceContextHolder.log; @@ -188,7 +183,7 @@ public class PurchaseOrderController extends BaseController purchaseMaterial.setSupplierName(purchaseOrder.getSupplierName()); // 创建列合并工具类对象 - ExcelFillCellMergePrevColUtils mergePrevColUtils = new ExcelFillCellMergePrevColUtils(); +// ExcelFillCellMergePrevColUtils mergePrevColUtils = new ExcelFillCellMergePrevColUtils(); List purchaseMaterialList = purchaseMaterialService.selectPurchaseMaterialList(purchaseMaterial); List purchaseMaterialDtoList = new ArrayList<>(); @@ -205,32 +200,28 @@ public class PurchaseOrderController extends BaseController target.setNumber(++number); purchaseMaterialDtoList.add(target); total = total + Double.parseDouble(target.getAmountMoney()); - purchaseOrderDto.setTotal(total); } }catch (Exception e) { log.error(">>>>>>异常<<<<<<", e); } System.out.println(purchaseMaterialDtoList); -// Map colMap = new HashMap<>(); -//// colMap.put(8, 9); -// colMap.put("rowNum1", purchaseMaterialDtoList.size()+8); -// colMap.put("rowNum2", purchaseMaterialDtoList.size()+8); -// colMap.put("colNum1", 8); -// colMap.put("colNum2", 9); - response.setCharacterEncoding("utf-8"); - String fileName = URLEncoder.encode("采购订单", "UTF-8").replaceAll("\\+", "%20"); - response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); + Map colMap = new HashMap<>(); + colMap.put(2, 3); + colMap.put(11, 12); +// response.setCharacterEncoding("utf-8"); +// String fileName = URLEncoder.encode("采购订单", "UTF-8").replaceAll("\\+", "%20"); +// response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); String templateFileName = "C:\\exportTemplates\\exportPurchaseOrder.xlsx"; try (ExcelWriter excelWriter = EasyExcel .write(response.getOutputStream(), PurchaseMaterialDto.class) .withTemplate(templateFileName) - .registerWriteHandler(mergePrevColUtils) +// .registerWriteHandler(mergePrevColUtils) //样式注册 // .registerWriteHandler(horizontalCellStyleStrategyBuilder()) - .registerWriteHandler(new CustomRowWriteHandler(1)) - .registerWriteHandler(new CustomRowWriteHandler(10)) -// .registerWriteHandler(new CustomRowWriteCellsHandler(colMap)) +// .registerWriteHandler(new CustomRowWriteHandler(1)) +// .registerWriteHandler(new CustomRowWriteHandler(10)) + .registerWriteHandler(new CustomRowWriteCellHandler(colMap)) .build()) { WriteSheet writeSheet = EasyExcel.writerSheet().build(); FillConfig fillConfig = FillConfig.builder().forceNewRow(Boolean.TRUE).build(); @@ -247,8 +238,9 @@ public class PurchaseOrderController extends BaseController map.put("approveName", purchaseOrderDto.getApproveName()); map.put("auditName", purchaseOrderDto.getAuditName()); map.put("purchaseCommander", purchaseOrderDto.getPurchaseCommander()); - map.put("total", purchaseOrderDto.getTotal()); + map.put("total", total); excelWriter.fill(map, writeSheet); +// excelWriter.close(); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/purchase/domain/exportDto/PurchaseMaterialDto.java b/ruoyi-admin/src/main/java/com/ruoyi/purchase/domain/exportDto/PurchaseMaterialDto.java index 4c1de123..f35c80c8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/purchase/domain/exportDto/PurchaseMaterialDto.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/purchase/domain/exportDto/PurchaseMaterialDto.java @@ -1,8 +1,6 @@ package com.ruoyi.purchase.domain.exportDto; import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.enums.poi.BorderStyleEnum; import com.ruoyi.common.core.domain.BaseEntity; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -26,7 +24,7 @@ public class PurchaseMaterialDto extends BaseEntity /** 订购单号 */ @ExcelProperty("订购单号") - @ContentStyle(borderLeft = BorderStyleEnum.NONE,borderTop = BorderStyleEnum.NONE,borderBottom = BorderStyleEnum.NONE,borderRight = BorderStyleEnum.NONE) +// @ContentStyle(borderLeft = BorderStyleEnum.NONE,borderTop = BorderStyleEnum.NONE,borderBottom = BorderStyleEnum.NONE,borderRight = BorderStyleEnum.NONE) private String purchaseOrderNumber; /** 供应商代码 */ @@ -35,7 +33,7 @@ public class PurchaseMaterialDto extends BaseEntity /** 供应商名称 */ @ExcelProperty("供应商名称") - @ContentStyle(borderLeft = BorderStyleEnum.NONE,borderTop = BorderStyleEnum.NONE,borderBottom = BorderStyleEnum.NONE,borderRight = BorderStyleEnum.NONE) +// @ContentStyle(borderLeft = BorderStyleEnum.NONE,borderTop = BorderStyleEnum.NONE,borderBottom = BorderStyleEnum.NONE,borderRight = BorderStyleEnum.NONE) private String supplierName; /** 原辅料代码 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/purchase/domain/exportDto/PurchaseOrderDto.java b/ruoyi-admin/src/main/java/com/ruoyi/purchase/domain/exportDto/PurchaseOrderDto.java index b2931139..9134f46c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/purchase/domain/exportDto/PurchaseOrderDto.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/purchase/domain/exportDto/PurchaseOrderDto.java @@ -1,12 +1,11 @@ package com.ruoyi.purchase.domain.exportDto; import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ContentStyle; -import com.alibaba.excel.enums.poi.BorderStyleEnum; import com.ruoyi.common.core.domain.BaseEntity; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; + /** * 采购订单对象 purchase_order * @@ -146,7 +145,8 @@ public class PurchaseOrderDto extends BaseEntity private String updateInfoTime; @ExcelProperty(value = "金额总计") - @ContentStyle(borderLeft = BorderStyleEnum.THIN,borderTop = BorderStyleEnum.THIN,borderBottom = BorderStyleEnum.THIN,borderRight = BorderStyleEnum.THIN) +// @ContentStyle(borderLeft = BorderStyleEnum.THIN,borderTop = BorderStyleEnum.THIN,borderBottom = BorderStyleEnum.THIN,borderRight = BorderStyleEnum.THIN) +// @ContentStyle(horizontalAlignment = com.alibaba.excel.enums.poi.HorizontalAlignmentEnum.CENTER) private Double total; public Double getTotal() { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/controller/WarehousingInInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/storehouse/controller/WarehousingInInfoController.java index a01978e5..61772a0a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/controller/WarehousingInInfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/storehouse/controller/WarehousingInInfoController.java @@ -39,6 +39,7 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.IOException; +import java.math.BigDecimal; import java.net.URLEncoder; import java.util.ArrayList; import java.util.Iterator; @@ -63,6 +64,7 @@ public class WarehousingInInfoController extends BaseController private String prefixFinishProduct = "storehouse/warehousingInFinishProduct"; private String prefixRGFinishProduct = "storehouse/warehousingInRGFinishProduct"; private String prefixPDFinishProduct = "storehouse/warehousingInPDFinishProduct"; + private String prefixPDBcp = "storehouse/warehousingInPDBcp"; @Autowired private IWarehousingInInfoService warehousingInInfoService; @@ -121,6 +123,12 @@ public class WarehousingInInfoController extends BaseController { return prefixPDFinishProduct + "/warehousingInPDFinishProduct"; } + @RequiresPermissions("storehouse:warehousingInInfo:viewPDBcp") + @GetMapping("/viewPDBcp") + public String warehousingInPDBcp() + { + return prefixPDBcp + "/warehousingInPDBcp"; + } // @RequiresPermissions("storehouse:warehousingInInfo:list") @@ -181,6 +189,15 @@ public class WarehousingInInfoController extends BaseController List list = warehousingInInfoService.selectWarehousingInPDFinishProductByNumber(warehousingInInfo); return getDataTable(list); } + @RequiresPermissions("storehouse:warehousingInInfo:listPDBcp") + @PostMapping("/listPDBcp") + @ResponseBody + public TableDataInfo listPDBcp(WarehousingInInfo warehousingInInfo) + { + startPage(); + List list = warehousingInInfoService.selectWarehousingInPDBcpByNumber(warehousingInInfo); + return getDataTable(list); + } /** * 导出入库列表 @@ -229,6 +246,11 @@ public class WarehousingInInfoController extends BaseController { return prefixPDFinishProduct + "/add"; } + @GetMapping("/addPDBcp") + public String addPDBcp() + { + return prefixPDBcp + "/add"; + } /** * 新增保存入库 @@ -280,6 +302,13 @@ public class WarehousingInInfoController extends BaseController mmap.put("warehousingInInfo", warehousingInInfo); return prefixPDFinishProduct + "/edit"; } + @GetMapping("/editPDBcp/{warehousingInfoId}") + public String editPDBcp(@PathVariable("warehousingInfoId") Long warehousingInfoId, ModelMap mmap) + { + WarehousingInInfo warehousingInInfo = warehousingInInfoService.selectWarehousingInInfoById(warehousingInfoId); + mmap.put("warehousingInInfo", warehousingInInfo); + return prefixPDBcp + "/edit"; + } /** * 修改保存入库 @@ -336,6 +365,11 @@ public class WarehousingInInfoController extends BaseController public Result getPDFinishProductId() throws Exception { return Result.getSuccessResult(warehousingInInfoService.getPDFinishProductId()); } + @PostMapping("/getPDBcpId") + @ResponseBody + public Result getPDBcpId() throws Exception { + return Result.getSuccessResult(warehousingInInfoService.getPDBcpId()); + } @RequiresPermissions("storehouse:warehousingInInfo:remove") @Log(title = "入库", businessType = BusinessType.DELETE) @@ -528,7 +562,9 @@ public class WarehousingInInfoController extends BaseController warehousingFinishProductNotice.setWorkOrderNumber(warehousingInInfo.getWorkOrderNumber()); List warehousingFinishProductNoticeList = warehousingFinishProductNoticeService.selectWarehousingFinishProductNoticeList(warehousingFinishProductNotice); target.setSalesOrderNumber(workOrderInfoList.get(0).getSalesOrderNumber()); - target.setAcceptanceQuantity(String.valueOf(Float.valueOf(warehousingFinishProductNoticeList.get(0).getQualifiedQuantity())+Float.valueOf(warehousingFinishProductNoticeList.get(0).getUnqualifiedQuantity()))); + BigDecimal qualifiedQuantity = new BigDecimal(warehousingFinishProductNoticeList.get(0).getQualifiedQuantity()); + BigDecimal unQualifiedQuantity = new BigDecimal(warehousingFinishProductNoticeList.get(0).getUnqualifiedQuantity()); + target.setAcceptanceQuantity(String.valueOf(qualifiedQuantity.add(unQualifiedQuantity))); target.setRejectionQuantity(warehousingFinishProductNoticeList.get(0).getUnqualifiedQuantity()); target.setNumber(++number); target.setInspectionStatus("OK"); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/domain/exportDto/WarehousingInspectionDetailDto.java b/ruoyi-admin/src/main/java/com/ruoyi/storehouse/domain/exportDto/WarehousingInspectionDetailDto.java index b39085d6..229d9521 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/domain/exportDto/WarehousingInspectionDetailDto.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/storehouse/domain/exportDto/WarehousingInspectionDetailDto.java @@ -80,10 +80,15 @@ public class WarehousingInspectionDetailDto extends BaseEntity /** 厂商批号 */ @ExcelProperty("厂商批号") private String manufacturerBatchNumber; + /** 生产单号 */ @Excel(name = "生产单号") private String productionOrderNumber; + /** 加工工序 */ + @Excel(name = "加工工序") + private String procedureName; + /** 备用一 */ private String standbyOne; @@ -269,6 +274,14 @@ public class WarehousingInspectionDetailDto extends BaseEntity this.productionOrderNumber = productionOrderNumber; } + public String getProcedureName() { + return procedureName; + } + + public void setProcedureName(String procedureName) { + this.procedureName = procedureName; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -278,7 +291,7 @@ public class WarehousingInspectionDetailDto extends BaseEntity .append("materialCode", getMaterialCode()) .append("materialName", getMaterialName()) .append("specificationModel", getSpecificationModel()) - .append("typeMachine", getTypeMachine()) + .append("typeMachine", getTypeMachine()) .append("materialType", getMaterialType()) .append("purchasingUnit", getPurchasingUnit()) .append("materialQuantity", getMaterialQuantity()) @@ -289,7 +302,8 @@ public class WarehousingInspectionDetailDto extends BaseEntity .append("judgmentResults", getJudgmentResults()) .append("receiptBatchNumber", getReceiptBatchNumber()) .append("manufacturerBatchNumber", getManufacturerBatchNumber()) - .append("productionOrderNumber", getProductionOrderNumber()) + .append("productionOrderNumber", getProductionOrderNumber()) + .append("procedureName", getProcedureName()) .append("standbyOne", getStandbyOne()) .append("standbyTwo", getStandbyTwo()) .toString(); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/mapper/WarehousingInInfoMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/storehouse/mapper/WarehousingInInfoMapper.java index e6d84b9f..2120fc0f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/mapper/WarehousingInInfoMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/storehouse/mapper/WarehousingInInfoMapper.java @@ -32,6 +32,7 @@ public interface WarehousingInInfoMapper public List selectWarehousingInFinishProductByNumber(WarehousingInInfo warehousingInInfo); public List selectWarehousingInRGFinishProductByNumber(WarehousingInInfo warehousingInInfo); public List selectWarehousingInPDFinishProductByNumber(WarehousingInInfo warehousingInInfo); + public List selectWarehousingInPDBcpByNumber(WarehousingInInfo warehousingInInfo); /** * 新增入库 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/IWarehousingInInfoService.java b/ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/IWarehousingInInfoService.java index 635ba095..d361583d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/IWarehousingInInfoService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/IWarehousingInInfoService.java @@ -32,6 +32,7 @@ public interface IWarehousingInInfoService public List selectWarehousingInFinishProductByNumber(WarehousingInInfo warehousingInInfo); public List selectWarehousingInRGFinishProductByNumber(WarehousingInInfo warehousingInInfo); public List selectWarehousingInPDFinishProductByNumber(WarehousingInInfo warehousingInInfo); + public List selectWarehousingInPDBcpByNumber(WarehousingInInfo warehousingInInfo); /** * 新增入库 @@ -70,4 +71,5 @@ public interface IWarehousingInInfoService public String getFinishProductId(); public String getRGFinishProductId(); public String getPDFinishProductId(); + public String getPDBcpId(); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/impl/WarehousingInInfoServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/impl/WarehousingInInfoServiceImpl.java index 3d75ebd0..16895d9d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/impl/WarehousingInInfoServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/impl/WarehousingInInfoServiceImpl.java @@ -70,6 +70,11 @@ public class WarehousingInInfoServiceImpl implements IWarehousingInInfoService { return warehousingInInfoMapper.selectWarehousingInPDFinishProductByNumber(warehousingInInfo); } + @Override + public List selectWarehousingInPDBcpByNumber(WarehousingInInfo warehousingInInfo) + { + return warehousingInInfoMapper.selectWarehousingInPDBcpByNumber(warehousingInInfo); + } /** @@ -145,4 +150,9 @@ public class WarehousingInInfoServiceImpl implements IWarehousingInInfoService String time = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(System.currentTimeMillis()); return "CPIN" + time; } + @Override + public String getPDBcpId() { + String time = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(System.currentTimeMillis()); + return "YLIN" + time; + } } diff --git a/ruoyi-admin/src/main/resources/mapper/manufacture/WorkOrderDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/manufacture/WorkOrderDetailMapper.xml index acd5590d..76bffa59 100644 --- a/ruoyi-admin/src/main/resources/mapper/manufacture/WorkOrderDetailMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/manufacture/WorkOrderDetailMapper.xml @@ -13,6 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -20,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select work_order_detail_id, work_order_number, material_code, material_name, specification_model, inventory_unit, material_type, material_consumption, item_number, description, standby_one, standby_two from work_order_detail + select work_order_detail_id, work_order_number, material_code, material_name, specification_model, inventory_unit, material_type, material_consumption, unit_usage, item_number, description, standby_one, standby_two from work_order_detail @@ -45,6 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into outsource_order_material outsource_order_number, + outsource_work_number, material_code, material_name, specification_model, @@ -60,6 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{outsourceOrderNumber}, + #{outsourceWorkNumber}, #{materialCode}, #{materialName}, #{specificationModel}, @@ -79,6 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update outsource_order_material outsource_order_number = #{outsourceOrderNumber}, + outsource_work_number = #{outsourceWorkNumber}, material_code = #{materialCode}, material_name = #{materialName}, specification_model = #{specificationModel}, diff --git a/ruoyi-admin/src/main/resources/mapper/purchase/PurchaseAccountReconciliationMapper.xml b/ruoyi-admin/src/main/resources/mapper/purchase/PurchaseAccountReconciliationMapper.xml index a1ea5e23..4bafa487 100644 --- a/ruoyi-admin/src/main/resources/mapper/purchase/PurchaseAccountReconciliationMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/purchase/PurchaseAccountReconciliationMapper.xml @@ -84,8 +84,8 @@ WHERE and pm.common_currency = #{commonCurrency} and pm.delivery_time between #{params.beginDeliveryTime} and #{params.endDeliveryTime} and pm.account_reconciliation_flag = #{accountReconciliationFlag} - and wii.warehousing_number like concat('%', #{warehousingNumber}, '%') - and wii.warehousing_date between #{params.beginWarehousingDate} and #{params.endWarehousingDate} + and wi.warehousing_number like concat('%', #{warehousingNumber}, '%') + and wi.warehousing_date between #{params.beginWarehousingDate} and #{params.endWarehousingDate} + + insert into warehousing_in_info diff --git a/ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionFL/add.html b/ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionFL/add.html index 6fc6f228..258a2db7 100644 --- a/ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionFL/add.html +++ b/ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionFL/add.html @@ -637,7 +637,7 @@ inventoryUnit: data[i].inventoryUnit, planQuantity: data[i].materialConsumption, description: '', - // unitUsage: '', + // unitUsage: data[i].unitUsage, storageLocation: '', materialType: data[i].materialType } diff --git a/ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionYL/add.html b/ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionYL/add.html index 2374305c..4072739a 100644 --- a/ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionYL/add.html +++ b/ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionYL/add.html @@ -355,7 +355,7 @@ // $.operate.save(prefix + "/add", $('#form-materialRequisitionYL-add').serialize()); // } let getData=$('#addMaterialTable').bootstrapTable('getData', true) - console.log(JSON.stringify(getData)) + // console.log(JSON.stringify(getData)) if(getData.length > 0){ //确认添加选中的物料数据 confirmMaterial(); @@ -457,12 +457,12 @@ validate: function (value) { } - }, - formatter: (value, row, index) => { - let quantity = $("input[name='workOrderQuantity']").val(); - row.planQuantity = quantity * row.unitUsage; - return quantity * row.unitUsage; } + // formatter: (value, row, index) => { + // let quantity = $("input[name='workOrderQuantity']").val(); + // row.planQuantity = quantity * row.unitUsage; + // return quantity * row.unitUsage; + // } }, { field: 'description', @@ -647,9 +647,9 @@ specificationModel: data[i].specificationModel, itemNumber: data[i].itemNumber, inventoryUnit: data[i].inventoryUnit, - planQuantity: '', + planQuantity: data[i].materialConsumption, description: '', - unitUsage: data[i].materialConsumption, + unitUsage: data[i].unitUsage, storageLocation: '', materialType: data[i].materialType } @@ -679,9 +679,9 @@ specificationModel: data[i].specificationModel, itemNumber: data[i].itemNumber, inventoryUnit: data[i].inventoryUnit, - planQuantity: '', + planQuantity: data[i].materialConsumption, description: '', - unitUsage: data[i].materialConsumption, + unitUsage: data[i].unitUsage, storageLocation: '', materialType: data[i].materialType } diff --git a/ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionYL/edit.html b/ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionYL/edit.html index 8090f394..20df8632 100644 --- a/ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionYL/edit.html +++ b/ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionYL/edit.html @@ -455,11 +455,11 @@ validate: function (value) { } - }, - formatter: (value, row, index) => { - let quantity = $("input[name='workOrderQuantity']").val(); - return quantity * row.unitUsage; } + // formatter: (value, row, index) => { + // let quantity = $("input[name='workOrderQuantity']").val(); + // return quantity * row.unitUsage; + // } }, { field: 'description', diff --git a/ruoyi-admin/src/main/resources/templates/manufacture/workOrderInfo/add.html b/ruoyi-admin/src/main/resources/templates/manufacture/workOrderInfo/add.html index 37468848..47b59152 100644 --- a/ruoyi-admin/src/main/resources/templates/manufacture/workOrderInfo/add.html +++ b/ruoyi-admin/src/main/resources/templates/manufacture/workOrderInfo/add.html @@ -323,6 +323,9 @@ + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInPDBcp/edit.html b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInPDBcp/edit.html new file mode 100644 index 00000000..d5da1ea8 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInPDBcp/edit.html @@ -0,0 +1,443 @@ + + + + + + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+
+
+

材料信息

+
+
+
+
+
+ + + + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInPDBcp/warehousingInPDBcp.html b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInPDBcp/warehousingInPDBcp.html new file mode 100644 index 00000000..180c9f44 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInPDBcp/warehousingInPDBcp.html @@ -0,0 +1,230 @@ + + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + + - + +
    • +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/bom/bom.html b/ruoyi-admin/src/main/resources/templates/system/bom/bom.html index bb9bebe4..ee47d05c 100644 --- a/ruoyi-admin/src/main/resources/templates/system/bom/bom.html +++ b/ruoyi-admin/src/main/resources/templates/system/bom/bom.html @@ -787,6 +787,7 @@ initBcpBcpDetail = function (index, row, $detail) { var bcpCode = row.bcpCode; + console.log(bcpCode) var bcpVersionNumber = row.bcpVersionNumber; // var bcp_table = $detail.html('
').find('table'); $("#bcp_bcp_table").bootstrapTable({ @@ -842,11 +843,11 @@ title: '单位' }, { - field: 'bcpConsumption', + field: 'bcpMaterialConsumption', title: '用量' }, { - field: 'bcpLoss', + field: 'bcpMaterialLoss', title: '损耗%' }, { diff --git a/ruoyi-admin/src/main/resources/templates/system/bom/edit.html b/ruoyi-admin/src/main/resources/templates/system/bom/edit.html index 586b1060..a1c4cdc9 100644 --- a/ruoyi-admin/src/main/resources/templates/system/bom/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/bom/edit.html @@ -846,12 +846,12 @@ title: '用量', editable: { type: 'text', - title: '使用量', - emptytext: '使用量', + title: '用量', + emptytext: '用量', validate: function (value) { - if (isNaN(value)) return '使用量必须是数字'; - var price = parseFloat(value); - if (price <= 0) return '使用量必须大于0'; + // if (isNaN(value)) return '使用量必须是数字'; + // var price = parseFloat(value); + // if (price <= 0) return '使用量必须大于0'; } } }, @@ -863,9 +863,9 @@ title: '损耗%', emptytext: '损耗%', validate: function (value) { - if (isNaN(value)) return '使用量必须是数字'; - var price = parseFloat(value); - if (price <= 0) return '使用量必须大于0'; + // if (isNaN(value)) return '使用量必须是数字'; + // var price = parseFloat(value); + // if (price <= 0) return '使用量必须大于0'; } } @@ -988,9 +988,9 @@ title: '使用量', emptytext: '使用量', validate: function (value) { - if (isNaN(value)) return '使用量必须是数字'; - var price = parseFloat(value); - if (price <= 0) return '使用量必须大于0'; + // if (isNaN(value)) return '使用量必须是数字'; + // var price = parseFloat(value); + // if (price <= 0) return '使用量必须大于0'; } } }, @@ -1002,9 +1002,9 @@ title: '损耗%', emptytext: '损耗%', validate: function (value) { - if (isNaN(value)) return '使用量必须是数字'; - var price = parseFloat(value); - if (price <= 0) return '使用量必须大于0'; + // if (isNaN(value)) return '使用量必须是数字'; + // var price = parseFloat(value); + // if (price <= 0) return '使用量必须大于0'; } } @@ -2132,9 +2132,9 @@ title: '使用量', emptytext: '使用量', validate: function (value) { - if (isNaN(value)) return '使用量必须是数字'; - var price = parseFloat(value); - if (price <= 0) return '使用量必须大于0'; + // if (isNaN(value)) return '使用量必须是数字'; + // var price = parseFloat(value); + // if (price <= 0) return '使用量必须大于0'; } } }, @@ -2146,9 +2146,9 @@ title: '损耗%', emptytext: '损耗%', validate: function (value) { - if (isNaN(value)) return '使用量必须是数字'; - var price = parseFloat(value); - if (price <= 0) return '使用量必须大于0'; + // if (isNaN(value)) return '使用量必须是数字'; + // var price = parseFloat(value); + // if (price <= 0) return '使用量必须大于0'; } } diff --git a/ruoyi-admin/src/main/resources/templates/system/procedure/add.html b/ruoyi-admin/src/main/resources/templates/system/procedure/add.html index 7e4ebf8b..155294b0 100644 --- a/ruoyi-admin/src/main/resources/templates/system/procedure/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/procedure/add.html @@ -2,6 +2,8 @@ + +
@@ -16,8 +18,8 @@
- +
@@ -50,8 +52,8 @@
- +
@@ -65,6 +67,7 @@
+ diff --git a/ruoyi-admin/src/main/resources/templates/system/procedure/edit.html b/ruoyi-admin/src/main/resources/templates/system/procedure/edit.html index 37531613..439fdb47 100644 --- a/ruoyi-admin/src/main/resources/templates/system/procedure/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/procedure/edit.html @@ -2,6 +2,8 @@ + +
@@ -17,8 +19,8 @@
- +
@@ -50,8 +52,8 @@
- + @@ -66,6 +68,7 @@
+ \ No newline at end of file diff --git a/ruoyi-admin/target/classes/com/ruoyi/manufacture/controller/MaterialRequisitionInfoController.class b/ruoyi-admin/target/classes/com/ruoyi/manufacture/controller/MaterialRequisitionInfoController.class index 7f5a8c50..8edb7cc7 100644 Binary files a/ruoyi-admin/target/classes/com/ruoyi/manufacture/controller/MaterialRequisitionInfoController.class and b/ruoyi-admin/target/classes/com/ruoyi/manufacture/controller/MaterialRequisitionInfoController.class differ diff --git a/ruoyi-admin/target/classes/com/ruoyi/manufacture/controller/WorkOrderInfoController.class b/ruoyi-admin/target/classes/com/ruoyi/manufacture/controller/WorkOrderInfoController.class index 026a5871..226edfff 100644 Binary files a/ruoyi-admin/target/classes/com/ruoyi/manufacture/controller/WorkOrderInfoController.class and b/ruoyi-admin/target/classes/com/ruoyi/manufacture/controller/WorkOrderInfoController.class differ diff --git a/ruoyi-admin/target/classes/com/ruoyi/manufacture/domain/WorkOrderDetail.class b/ruoyi-admin/target/classes/com/ruoyi/manufacture/domain/WorkOrderDetail.class index 3ee5b55e..5c1a8116 100644 Binary files a/ruoyi-admin/target/classes/com/ruoyi/manufacture/domain/WorkOrderDetail.class and b/ruoyi-admin/target/classes/com/ruoyi/manufacture/domain/WorkOrderDetail.class differ diff --git a/ruoyi-admin/target/classes/com/ruoyi/manufacture/domain/exportDto/MaterialRequisitionDetailDto.class b/ruoyi-admin/target/classes/com/ruoyi/manufacture/domain/exportDto/MaterialRequisitionDetailDto.class index 159e4b23..2d053041 100644 Binary files a/ruoyi-admin/target/classes/com/ruoyi/manufacture/domain/exportDto/MaterialRequisitionDetailDto.class and b/ruoyi-admin/target/classes/com/ruoyi/manufacture/domain/exportDto/MaterialRequisitionDetailDto.class differ diff --git a/ruoyi-admin/target/classes/com/ruoyi/manufacture/domain/exportDto/MaterialRequisitionInfoDto.class b/ruoyi-admin/target/classes/com/ruoyi/manufacture/domain/exportDto/MaterialRequisitionInfoDto.class index 0e981fe5..96a249bf 100644 Binary files a/ruoyi-admin/target/classes/com/ruoyi/manufacture/domain/exportDto/MaterialRequisitionInfoDto.class and b/ruoyi-admin/target/classes/com/ruoyi/manufacture/domain/exportDto/MaterialRequisitionInfoDto.class differ diff --git a/ruoyi-admin/target/classes/com/ruoyi/purchase/controller/PurchaseOrderController.class b/ruoyi-admin/target/classes/com/ruoyi/purchase/controller/PurchaseOrderController.class index bc194603..510e098c 100644 Binary files a/ruoyi-admin/target/classes/com/ruoyi/purchase/controller/PurchaseOrderController.class and b/ruoyi-admin/target/classes/com/ruoyi/purchase/controller/PurchaseOrderController.class differ diff --git a/ruoyi-admin/target/classes/com/ruoyi/purchase/domain/exportDto/PurchaseMaterialDto.class b/ruoyi-admin/target/classes/com/ruoyi/purchase/domain/exportDto/PurchaseMaterialDto.class index 0b8e79d2..bfee8006 100644 Binary files a/ruoyi-admin/target/classes/com/ruoyi/purchase/domain/exportDto/PurchaseMaterialDto.class and b/ruoyi-admin/target/classes/com/ruoyi/purchase/domain/exportDto/PurchaseMaterialDto.class differ diff --git a/ruoyi-admin/target/classes/com/ruoyi/purchase/domain/exportDto/PurchaseOrderDto.class b/ruoyi-admin/target/classes/com/ruoyi/purchase/domain/exportDto/PurchaseOrderDto.class index 13e24ae7..298b0e4d 100644 Binary files a/ruoyi-admin/target/classes/com/ruoyi/purchase/domain/exportDto/PurchaseOrderDto.class and b/ruoyi-admin/target/classes/com/ruoyi/purchase/domain/exportDto/PurchaseOrderDto.class differ diff --git a/ruoyi-admin/target/classes/mapper/manufacture/WorkOrderDetailMapper.xml b/ruoyi-admin/target/classes/mapper/manufacture/WorkOrderDetailMapper.xml index acd5590d..76bffa59 100644 --- a/ruoyi-admin/target/classes/mapper/manufacture/WorkOrderDetailMapper.xml +++ b/ruoyi-admin/target/classes/mapper/manufacture/WorkOrderDetailMapper.xml @@ -13,6 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -20,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select work_order_detail_id, work_order_number, material_code, material_name, specification_model, inventory_unit, material_type, material_consumption, item_number, description, standby_one, standby_two from work_order_detail + select work_order_detail_id, work_order_number, material_code, material_name, specification_model, inventory_unit, material_type, material_consumption, unit_usage, item_number, description, standby_one, standby_two from work_order_detail - +
@@ -50,8 +52,8 @@
- + @@ -66,6 +68,7 @@
+ \ No newline at end of file