From 783a59f60a8ab9ec3e8f0acfa35619d10e829d1d Mon Sep 17 00:00:00 2001 From: ling li <709673163@qq.com> Date: Mon, 19 Jun 2023 08:45:33 +0800 Subject: [PATCH] =?UTF-8?q?230619=E5=A7=94=E5=A4=96=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E6=A3=80=E9=AA=8C=E9=80=9A=E7=9F=A5=E5=8D=95=EF=BC=8C=E8=BE=85?= =?UTF-8?q?=E6=96=99=E9=A2=86=E6=96=99=E5=8D=95=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WorkOrderInfoController.java | 37 +- .../manufacture/domain/WorkOrderDetail.java | 16 +- .../MaterialRequisitionDetailDto.java | 22 +- .../exportDto/MaterialRequisitionInfoDto.java | 20 +- .../OutsourceInspectionNoticeController.java | 51 +- .../domain/OutsourceOrderMaterial.java | 15 +- ...rchaseAccountReconciliationController.java | 43 +- .../controller/PurchaseOrderController.java | 38 +- .../domain/exportDto/PurchaseMaterialDto.java | 6 +- .../domain/exportDto/PurchaseOrderDto.java | 6 +- .../WarehousingInInfoController.java | 38 +- .../WarehousingInspectionDetailDto.java | 18 +- .../mapper/WarehousingInInfoMapper.java | 1 + .../service/IWarehousingInInfoService.java | 2 + .../impl/WarehousingInInfoServiceImpl.java | 10 + .../manufacture/WorkOrderDetailMapper.xml | 6 +- .../OutsourceOrderMaterialMapper.xml | 6 +- .../PurchaseAccountReconciliationMapper.xml | 4 +- .../storehouse/WarehousingInInfoMapper.xml | 12 + .../materialRequisitionFL/add.html | 2 +- .../materialRequisitionYL/add.html | 20 +- .../materialRequisitionYL/edit.html | 8 +- .../manufacture/workOrderInfo/add.html | 984 +++++++++++++++++- .../manufacture/workOrderInfo/edit.html | 600 ++++++++--- .../workOrderInfo/workOrderInfo.html | 71 +- .../outsourceInspectionNotice/add.html | 2 +- .../outsourceInspectionNotice/edit.html | 2 +- .../outsource/outsourceOrderInfo/add.html | 17 + .../outsource/outsourceOrderInfo/edit.html | 17 + .../purchaseAccountReconciliation.html | 34 +- .../storehouse/warehousingInPDBcp/add.html | 797 ++++++++++++++ .../storehouse/warehousingInPDBcp/edit.html | 443 ++++++++ .../warehousingInPDBcp.html | 230 ++++ .../resources/templates/system/bom/bom.html | 5 +- .../resources/templates/system/bom/edit.html | 40 +- .../templates/system/procedure/add.html | 20 +- .../templates/system/procedure/edit.html | 24 +- .../MaterialRequisitionInfoController.class | Bin 23548 -> 24488 bytes .../controller/WorkOrderInfoController.class | Bin 14533 -> 14489 bytes .../manufacture/domain/WorkOrderDetail.class | Bin 4186 -> 4441 bytes .../MaterialRequisitionDetailDto.class | Bin 6778 -> 6291 bytes .../MaterialRequisitionInfoDto.class | Bin 8316 -> 7861 bytes .../controller/PurchaseOrderController.class | Bin 14369 -> 13783 bytes .../exportDto/PurchaseMaterialDto.class | Bin 5453 -> 5222 bytes .../domain/exportDto/PurchaseOrderDto.class | Bin 10598 -> 10399 bytes .../manufacture/WorkOrderDetailMapper.xml | 6 +- .../manufacture/workOrderInfo/add.html | 984 +++++++++++++++++- .../manufacture/workOrderInfo/edit.html | 600 ++++++++--- .../workOrderInfo/workOrderInfo.html | 71 +- .../classes/templates/system/bom/bom.html | 5 +- .../classes/templates/system/bom/edit.html | 40 +- .../templates/system/procedure/add.html | 20 +- .../templates/system/procedure/edit.html | 24 +- 53 files changed, 4816 insertions(+), 601 deletions(-) create mode 100644 ruoyi-admin/src/main/resources/templates/storehouse/warehousingInPDBcp/add.html create mode 100644 ruoyi-admin/src/main/resources/templates/storehouse/warehousingInPDBcp/edit.html create mode 100644 ruoyi-admin/src/main/resources/templates/storehouse/warehousingInPDBcp/warehousingInPDBcp.html 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 7f5a8c508b9e741f10028708922de22ba3850cf0..8edb7cc794ccf9e300a660e6cf1a8ea23b54108f 100644 GIT binary patch delta 8544 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 delta 7753 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 E0iZnq-2eap 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 026a5871b64921f6372a8a78a000e2e581b6a42d..226edfff8ee4fd518b587a1cf572e06c6d789187 100644 GIT binary patch delta 5155 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 H_OSmCSHNM- 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 3ee5b55ec01481a12d6e322eea62834d4639c043..5c1a8116e300e181394b54f4e2cfe021ada0fb2b 100644 GIT binary patch literal 4441 zcmb7`k5?2`6vyu%KZa%bAp)jZX;uQ7Ynf@`j|5gj7cdu4%few9VQ_bbc4tM@N)uBv z{FOhmlztucbULZW;G9tV{qye-vHplo-#fFg!|dCWa@hOsd-uNkKJUHz-kZPv{q8mq zJx8B;$Va`oG@o{|*u`Qui?>+3&Eg#vdsysc@h*#fEc#gNXYpPR9mu7FbjU-6^uA1s zJZL=3l@DZE%$0tbmT`GRrWITsm1!lH$7HJE^0-WXE>Fm`n#&Jms^jvcOl!G3B~v|@ zr)6s7@{CODxID{)oXeq)a_GE7MKLw1Dd8418q*BDxvo|sX^lkrHHIED72Rx6!f`bV z6X!okqRBl*bX#MzU5(bNrlN)G+7TnrrEFJxVMXuo1q{8TN}|GXw}yD6O^r%a>~IR2 zQO$Cjwmz<#T10KpVp>~RU8(Dash9wXNi;hUG9tcc-00PO&?1KJQ^xH+|BjFv#z2|6 z5>X|}9U1y^r2o{&(IJVv5yiA7Rb#Zn&MW5$$c(HB+K&41DKSzaw;0Z+CLw z(QCsa2fvbNN)k(t#UtH3O>`bTdHL@HM=^sqf;GpK4(@4395Z<|Q;m$RV>aeuVdS-| zu~1YSi*xUr8+Xqhk;uc_*520Js3Xu=rK!ijP)juov0S1_L%LPjXa3)B;hnP#VkO_}f5l!&6ow<;ks9#wtqMnutc--e0Ff&D3osiv!yQ)WuJ zBOR=qVWg4{p>uJ0h1;8V%HcbNE&LtDVj^|_{0@qK-phEO^wK#n2 zJaYQjEv4`Y3bLsb(M0VyiDuoz%qoJbtI0`crl= zjZ?M6m0I)pBJ$EJwBAdL=y@+KrX^ll#$pAFl`Lvl_*txGQO9B}i+UD~EY{Hyi53{q z4xiGkggVv41r)RHxP`v9xE96@=xa()RonF(`q)dK&;SPba$&d z?vstqfQh5*xHA$%RNVg4-yIxV1QNTO#^%be z$Yy$71Tx7D(g2XgG$3|XNPPMQAd}o6K_SQ%F-WExWCK7prU9|DP~sa%0Fvnj*(?NU z6N6;ALAC%yNdsbMy~MYm03^!|q6$IU#UR;k5Dg$*X+Z2#Ch<)y0LgZP=t7XKVvrm+ zNE9HkG$8h=miRRgfaJJAdW0aIVi4I4vI`))(}38wh{P|F07Q0!>=A-=i9vGRAbkMY zp9aLfwIqHO1t7U@kV8TcyrzQA9(U({Vdsc=79RI3j$;-l(#*oXVkOeWvGUxpP9xTt zG_mYkS>mq)!KCuslR7V)RJRz!>jt?9kbyKH_A4Oq7m5JH>jwEk2oe>8Ak#w3GgzJ@hB-L*L|M-#7l)_gF9Sj{gAcV`5eS literal 4186 zcmb7{`%@H05XXCv#{$Pg1dQgTF^Pc2vwY+shA09NJivGdKB6JZvEbs}F5c~ls7W-@ z_zG%#TS=v?N-SfgDn6o+NRmGw|3iKgG5HiZ+tUiQaQl@)8@U}-sEyk* z3T@){EC)YVKwlToc|qlIEvBoHZY>tqO{1%|Nswq0RI6cTpAa;A z*o^JzjP+@;Ce2dyNNXQr1P0Z8sz0I{1O9+%4AcuMn{n$%M0>TEpbD2$(2D7{+q^9a z!_uQ#w;tDfBieeyFfG*rNLV+nIa_d|=ChF_hr`KjCdkC#Gi@DQx|{y=lEGcMY^R$r#CAf!1h|jeOf#m)2E%E+`j+#>KQom+4S{} zbQ)M^x)T~U5pS&ys0Kl^YHGW&JnP;|JL*jz#&w|HOn)~c`>KPb>?cF1c5BMyg$Od|78QsygjMT!s=}+m&P`ys)cZ3VV|~-Adt*Hoy^ruFT^I zY5kPlPDYpA?kkq*oB)zGXeMG|twrZ#tn?($GOi~+3Q)U`R?tcx3hinitzog2MFWd< zEE-ufv1nnjkwqJeO|)9jax*sISBKQ_ZY^0t;&zo<>F-VG5!5h$C<)Z)^b6>Mk1od=s8piXRa2TWd3S1m{`QTz03Bu}%R7UI2IiifL&=F=Orj0E}7 z%c14?Lt@!Fatq^cLN7-97XIFj(>riLzGWKfVL%RM8s3Egd6{W=4+i9FreQq{$lpxE z1{jdjnTBQCe3ai9-q3wnZr6oTZ*4G5mY-gQeJP)=%gkv+Pe^6+^aq1y3EM&RhY_q;GJSTa@$ z-RQs4zK0AgkVaW1dmdM^Pf@PfppAYnO(;sqH7$o?!KPO%XD=14#kFUTP& zh$aUq^nx4)$dN1{PH__a?nyujy&%V=AOmucA}`2EfSk$#;uJ%{Z?6QT$P02t3ZlzF zioGD`0dgS=h*Nw8zyA`DVlT)QDaalZ_fD=U73NI-mEkn2*As2rrk z3-SX%Ze#)B*M>pxJ4gaj;sv=S1;Ov9ejZ+W(iuC-A_R>QdrU^QL Td7ClYc~%e3JgY}vMe=j?O#`JHpm-sjA@4<^qN(e?CKAFZTkO6iOAEQ{w@JkR2XEM8zS%HkM{F&4*J zyvX7u7AIJ|%wn9y1dEd_USToG;#3KpE~PVc)<<>pBZY4Eq48C&yrxhaSAML}S}uR0 zP&=1DRj8B8*A?pK@@ERI=kn(YZRGM73f<1-8w%aQzSwONq3 zMNs)_(@0vXVRfs~lvado$?TBd6pgPkb*uo9#5@uXWSp9HSw4JBM zjOoe2^x%Y`1u@miz_x4KQt;1in>9<-qpdwyh=V6&8odl78L%dcA8>TdEONJ5kM9*Ql|)HNAgedSpycAQ{&p`er?n zS$!KEL^0(3kzG?qPNxs=%lP-{mKMta74yWr%rdJ#uC=L=KHcEePaT?^9vQ$F(T(kz zVVQ~kER)>{XEC$(e$22riR8Y+&>6!Jz6r7(Br&W81(+J z6H~(v2`Wv&Nmo+sWpdlo^ucE`BPx@a1cs1lvvY?RhNljm#cb1OMp4Zzyc3|P+S@XH z{8W0+^MZVQYAcGnRG~(!lp1xQrbiE_2OrL%mW0h%yJ~C|v@~;45-GD^ z58}+kOyi=1g3nuMWH!DS!!8Vu<3y(7H|d6+?871INkuICtJR%9xp#VUBt5WqYR~@k zft|U}S9~M-S}O$2X=v<*GrM!|7$1`NA=<4XN>I->7FvBePIQZdGo~7; z&Ah^d7VI%&s&3$j$IXP*Y?;9}uagTSR{hYU*-gB@b+ZDQ*=M)#T+PmK=DB7y_|b#YLoTvmcT@wgcDRE(fIb&BI(OTSa_3Ik zExZ#Qj#%fNnpMx+GvV*BXX-xmUzLk^A3D!e>KR)W%k}6bHB@87N>_HNMrU`MVwv`d zLTc(TQ;CRnlg>fD#PjqcK$r7H=cfcE{nSQl{B$#Y$xmx(ouArSbh7AXv7W_77Pqsw zgT|wE౏vDnYz5f%qoJj!C2 z#dla7VsV(o_gNfe@g$3;nNOdq)TGvuz15a~=#A;H z`uU4iwRMF$TQ`MT*R*Wv=-d!$!RCfOniC}E7H1Ay8{VQttfr6Zg>zo98jouR68U^W$nC3xDc#2c-a=F=)#O@f+HE1(wq;lQHaih2dgTk!Yg+ejoS z1RG9trXS9;w9l>RgJUkWb-;$xFST{ShMP& zfXr~QVH-7|5$Oohg6|+ofwE}X1c~FB$x@KTnZ`=m4&85epu1=XYJ&RdZb%-y0<#ow z?`2oLOa=MTzD#Q`6=5Olq2BJ5^}ycw;PAxAIayzMkP|d#41)?N53*GXau0n&1~SJD zVge-Y0b-wS!6{DyQs4%$q#!%#UKvQC8)OGS`aMAG5E7hrB_M@vkb9&c->MljDIi%?se4h+Nf$LJ2l2T*OakI}gS;*U8IpsPyFuOn$T<%X`(70M zG?ajpyFuQRf;=V%sc?h51(3HrK@-9H$^8m4Le8Ep- z2}q?I||k2KlEH1V1q(g9Glt|B?P+6UIb9Aj~u#W0H#ES_g^ zlEny%Q!HL!ahk;$7T;s>eHK4p@nRXhR8BvnA5~Bt{aB$}D$w{cSAL>U8&`g+PzRT< zD72ExR~1^tg4k03Ta&aLZK*^uPdZ;`Ada*xcrqu2A989Xf2m-C=}=N zO@%Bjf1^->%ik)L;_`P2ZQ$}Ph1PNTdxrW$8U3-0-WD`5r6&z7)}bd;hGn)lHwqHB z394FRnJHT{?G7!L)=RLA{3isJn(26#o)k1GvPN64g=3o86K*zby+=H(0i9#RXNm)fGlhFZ@rBYqqndEA(|~ECbKJ zQMWZC*4&Nt_AFb(GJANn0$M>G9}xj-tVSs)&z{BuHG!>i zdm3BHu={w7BTr;Fx9BNsY6 zVFXS(akF6>sb1{$?sU|4-&)<-=eLcG3}*Vbjc(nUd1O=W^_AX)zV;$P6XwqAfHSvu zO$4j%zLGW#afTPk>k#YE5X`7&8;k8;1A*7%;f!l$dNt25sfW9*xMrA$#DtZ!8*MAx z60~#i5Hp#X((S-5ytyaM^=wyXcQbQ&k8bC-Pu<*ko-X;kQ4ZI+KJ{KNxi0KzCLF!* z_@Qy$v*9&EPMsUA&O2H*#CWh7^1*UulgABpJ~V4QgJoZp$4|D!)5i_U8c!d$r4D^s zC81e|p0f5Tv^RUgvH}8V2JUa1hwd<70OsJ00J|^IJYHkePja3y;<4 z4QC!}T!V@poE~zKjpv?f2v1x6!5u=M3mUzv?MAtGCEXTYiB?an^Gc1Y=bt;_?|JUj zE6~3o7x5M7e7;i8*s@rzM=$AvT39UhWtUoX_O~gvu-L`oVHSH>e3iwcEWXC#>ny&(;t3XqSbU4cw^I$M3A!ThC7b4>Rz7_;XeqrZd#Wuccww9y2Cf4w?UAy5^dt4VrU1XlT2k9s0k%kXQYI5j$brtjLK<{R+ z$pXef7R}mLqO|c#r)WI}L1w-1!96q=jY#K^_hRfYN`bOu{s|IC9hlEUmO72K^abdu z+kw7F_n{`}OSB1+jTd2*BJMr^%Hvd&x2|wn4Jx5Ej)!`;SJnf2=fL8Dk+ZYD@*u}( z!VsJmQ63~N1=&Jhk%3I`gRBEcG62NQ4uX#i2}qG2WW5w*D?KO!DfWYG1jxMsAa05g zd~8WTiv1w>NkMkVK}!4}n*p*V0L0B_f{#uKNQob0s}$rRIY_A=WCuX{13=v5DERo6 zfRy?{c1b~Y%0bHfAbS9^Hvq)Vw1Te?5|A=K$YW9vTs)fG_t95PX%AOsd>Jsi&or+A9aC@PiBiHb zECqR74pQX@c@-e91%SBcuHdV+1fjUVJ~fV>j`;@$`Ze_}{LYWyJYNb^MgcMw0K(S~K7H|-BLSJ{2l<;6 zd~f#9|!yH!0Y2btsp5yey@N&-OK8=v4$RSC#sKZqg)c}fm4*$<)uq$&W! zz0V5%Ty{akjri8$d*;X~s#`h#IjTQFQ$iQbAEv3pG%Yk8$_!R6hBA|tOQ6hRWj2&c zS(yXnGFC2!@*!5PfHIerc~I~_Ep#R1RjgbMWdSQ;DA%y^VJO$KavhZGS@{T*kFs(D zlp9(37?h8*vJlEmtb78>A}GW3$^7cwMfJD`*HX0z(G)R>W{Jr(Pt?)1qMjCtDby$~ zq82fgI>a>U6w|3!%%FARV%jKX(q?f9?GUqQkC;vS#icYT=FpJ1jE2SKbP_)ETVv$> Lh5H%jHhkoNwSJQK 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 0e981fe589d44a3a509b672dc694e1dab94606a3..96a249bf8f8b60c0695fc23828af203d07a61ed7 100644 GIT binary patch literal 7861 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 PrT1L?()+x9BYoi`W4i%a 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 bc194603303e05b595c83dbb0607026683a6198d..510e098cc8ef7ccbb81edaa820634f9858ecf541 100644 GIT binary patch delta 4863 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 delta 5311 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 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 0b8e79d2cf5a337d85106d75d8d242de1d8e6a48..bfee80062a06804a83ef76fd8c57274adb2b11b8 100644 GIT binary patch literal 5222 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 wy6K;|3%tI4%K!iX 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 13e24ae7dd3257a0d249b8b06612633586251f16..298b0e4d68942c71b5d42c0f962146d7a61ce340 100644 GIT binary patch literal 10399 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 Tcv|-`Re`gIsd9OUN}jbWH2)wXC^>gT|pP{ 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 bj5vz_gZPF$p6r1j@|-hF(Sr{wMbG~M?Kd8a 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