From 4f318afbb9f6de04e763169cc26feef9a792e585 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Fri, 18 Oct 2024 10:20:24 +0800 Subject: [PATCH] =?UTF-8?q?[delete]=20=E5=88=A0=E9=99=A4=E6=97=A7=E7=89=88?= =?UTF-8?q?=E6=97=A0=E7=94=A8=E7=9A=84=E6=88=90=E5=93=81=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E9=80=9A=E7=9F=A5warehousing=5Ffinish=5Fproduct=5Fnotice?= =?UTF-8?q?=E5=92=8C=E7=B3=BB=E7=BB=9F=E4=B8=AD=E5=AF=B9=E5=BA=94=E7=9A=84?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E6=89=80=E6=9C=89=E4=BB=A3=E7=A0=81=E5=92=8C?= =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=89=80=E6=9C=89=E4=BB=A3=E7=A0=81=20?= =?UTF-8?q?=E5=92=8C=E5=AF=B9=E5=BA=94=E7=9A=84=E7=B3=BB=E7=BB=9F=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E6=95=B0=E6=8D=AE=20=E5=88=A0=E9=99=A4=E6=97=A7?= =?UTF-8?q?=E7=89=88=E6=97=A0=E7=94=A8=E7=9A=84=E5=85=A5=E5=BA=93=E8=A1=A8?= =?UTF-8?q?warehousing=5Fin=5Finfo=E5=92=8C=E7=B3=BB=E7=BB=9F=E4=B8=AD?= =?UTF-8?q?=E5=AF=B9=E5=BA=94=E7=9A=84=E5=89=8D=E7=AB=AF=E6=89=80=E6=9C=89?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=92=8C=E5=90=8E=E7=AB=AF=E6=89=80=E6=9C=89?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=20=E5=92=8C=E5=AF=B9=E5=BA=94=E7=9A=84?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E8=8F=9C=E5=8D=95=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ehousingFinishProductNoticeController.java | 135 ---- .../WarehousingFinishProductNotice.java | 425 ------------ .../WarehousingFinishProductNoticeMapper.java | 64 -- ...WarehousingFinishProductNoticeService.java | 64 -- ...housingFinishProductNoticeServiceImpl.java | 103 --- .../WarehousingInInfoController.java | 649 ------------------ .../storehouse/domain/WarehousingInInfo.java | 397 ----------- .../mapper/WarehousingInInfoMapper.java | 71 -- .../service/IWarehousingInInfoService.java | 75 -- .../impl/WarehousingInInfoServiceImpl.java | 158 ----- .../WarehousingFinishProductNoticeMapper.xml | 179 ----- .../storehouse/WarehousingInInfoMapper.xml | 236 ------- .../warehousingFinishProductNotice/add.html | 264 ------- .../warehousingFinishProductNotice/edit.html | 240 ------- .../warehousingFinishProductNotice.html | 343 --------- .../storehouse/warehousingInInfo/add.html | 166 ----- .../storehouse/warehousingInInfo/edit.html | 167 ----- .../warehousingInInfo/warehousingInInfo.html | 220 ------ 18 files changed, 3956 deletions(-) delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/manufacture/controller/WarehousingFinishProductNoticeController.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/manufacture/domain/WarehousingFinishProductNotice.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/manufacture/mapper/WarehousingFinishProductNoticeMapper.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/manufacture/service/IWarehousingFinishProductNoticeService.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/manufacture/service/impl/WarehousingFinishProductNoticeServiceImpl.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/storehouse/controller/WarehousingInInfoController.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/storehouse/domain/WarehousingInInfo.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/storehouse/mapper/WarehousingInInfoMapper.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/IWarehousingInInfoService.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/impl/WarehousingInInfoServiceImpl.java delete mode 100644 ruoyi-admin/src/main/resources/mapper/manufacture/WarehousingFinishProductNoticeMapper.xml delete mode 100644 ruoyi-admin/src/main/resources/mapper/storehouse/WarehousingInInfoMapper.xml delete mode 100644 ruoyi-admin/src/main/resources/templates/manufacture/warehousingFinishProductNotice/add.html delete mode 100644 ruoyi-admin/src/main/resources/templates/manufacture/warehousingFinishProductNotice/edit.html delete mode 100644 ruoyi-admin/src/main/resources/templates/manufacture/warehousingFinishProductNotice/warehousingFinishProductNotice.html delete mode 100644 ruoyi-admin/src/main/resources/templates/storehouse/warehousingInInfo/add.html delete mode 100644 ruoyi-admin/src/main/resources/templates/storehouse/warehousingInInfo/edit.html delete mode 100644 ruoyi-admin/src/main/resources/templates/storehouse/warehousingInInfo/warehousingInInfo.html diff --git a/ruoyi-admin/src/main/java/com/ruoyi/manufacture/controller/WarehousingFinishProductNoticeController.java b/ruoyi-admin/src/main/java/com/ruoyi/manufacture/controller/WarehousingFinishProductNoticeController.java deleted file mode 100644 index f18a13f8..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/manufacture/controller/WarehousingFinishProductNoticeController.java +++ /dev/null @@ -1,135 +0,0 @@ -package com.ruoyi.manufacture.controller; - -import com.ruoyi.ck.utils.Result; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.manufacture.domain.WarehousingFinishProductNotice; -import com.ruoyi.manufacture.service.IWarehousingFinishProductNoticeService; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * 成品入库通知Controller - * - * @author ruoyi - * @date 2023-04-24 - */ -@Controller -@RequestMapping("/manufacture/warehousingFinishProductNotice") -public class WarehousingFinishProductNoticeController extends BaseController -{ - private String prefix = "manufacture/warehousingFinishProductNotice"; - - @Autowired - private IWarehousingFinishProductNoticeService warehousingFinishProductNoticeService; - - @RequiresPermissions("manufacture:warehousingFinishProductNotice:view") - @GetMapping() - public String warehousingFinishProductNotice() - { - return prefix + "/warehousingFinishProductNotice"; - } - - /** - * 查询成品入库通知列表 - */ - @RequiresPermissions("manufacture:warehousingFinishProductNotice:list") - @PostMapping("/list") - @ResponseBody - public TableDataInfo list(WarehousingFinishProductNotice warehousingFinishProductNotice) - { - startPage(); - List list = warehousingFinishProductNoticeService.selectWarehousingFinishProductNoticeList(warehousingFinishProductNotice); - return getDataTable(list); - } - - /** - * 导出成品入库通知列表 - */ - @RequiresPermissions("manufacture:warehousingFinishProductNotice:export") - @Log(title = "成品入库通知", businessType = BusinessType.EXPORT) - @PostMapping("/export") - @ResponseBody - public AjaxResult export(WarehousingFinishProductNotice warehousingFinishProductNotice) - { - List list = warehousingFinishProductNoticeService.selectWarehousingFinishProductNoticeList(warehousingFinishProductNotice); - ExcelUtil util = new ExcelUtil(WarehousingFinishProductNotice.class); - return util.exportExcel(list, "成品入库通知数据"); - } - - /** - * 新增成品入库通知 - */ - @GetMapping("/add") - public String add() - { - return prefix + "/add"; - } - - /** - * 新增保存成品入库通知 - */ - @RequiresPermissions("manufacture:warehousingFinishProductNotice:add") - @Log(title = "成品入库通知", businessType = BusinessType.INSERT) - @PostMapping("/add") - @ResponseBody - public AjaxResult addSave(WarehousingFinishProductNotice warehousingFinishProductNotice) - { - return toAjax(warehousingFinishProductNoticeService.insertWarehousingFinishProductNotice(warehousingFinishProductNotice)); - } - - /** - * 修改成品入库通知 - */ - @GetMapping("/edit/{warehousingFinishProductNoticeId}") - public String edit(@PathVariable("warehousingFinishProductNoticeId") Long warehousingFinishProductNoticeId, ModelMap mmap) - { - WarehousingFinishProductNotice warehousingFinishProductNotice = warehousingFinishProductNoticeService.selectWarehousingFinishProductNoticeById(warehousingFinishProductNoticeId); - mmap.put("warehousingFinishProductNotice", warehousingFinishProductNotice); - return prefix + "/edit"; - } - - /** - * 修改保存成品入库通知 - */ - @RequiresPermissions("manufacture:warehousingFinishProductNotice:edit") - @Log(title = "成品入库通知", businessType = BusinessType.UPDATE) - @PostMapping("/edit") - @ResponseBody - public AjaxResult editSave(WarehousingFinishProductNotice warehousingFinishProductNotice) - { - return toAjax(warehousingFinishProductNoticeService.updateWarehousingFinishProductNotice(warehousingFinishProductNotice)); - } - - /** - * 删除成品入库通知 - */ - @RequiresPermissions("manufacture:warehousingFinishProductNotice:remove") - @Log(title = "成品入库通知", businessType = BusinessType.DELETE) - @PostMapping( "/remove") - @ResponseBody - public AjaxResult remove(String ids) - { - return toAjax(warehousingFinishProductNoticeService.deleteWarehousingFinishProductNoticeByIds(ids)); - } - - /** - * 获取单号 - * @return - * @throws Exception - */ - @PostMapping("/id") - @ResponseBody - public Result getId() throws Exception { - return Result.getSuccessResult(warehousingFinishProductNoticeService.getId()); - } -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/manufacture/domain/WarehousingFinishProductNotice.java b/ruoyi-admin/src/main/java/com/ruoyi/manufacture/domain/WarehousingFinishProductNotice.java deleted file mode 100644 index 4b450239..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/manufacture/domain/WarehousingFinishProductNotice.java +++ /dev/null @@ -1,425 +0,0 @@ -package com.ruoyi.manufacture.domain; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; - -/** - * 成品入库通知对象 warehousing_finish_product_notice - * - * @author ruoyi - * @date 2023-04-24 - */ -public class WarehousingFinishProductNotice extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 成品入库通知id */ - @Excel(name = "成品入库通知id") - private Long warehousingFinishProductNoticeId; - - /** 通知单号 */ - @Excel(name = "通知单号") - private String notificationNumber; - - /** 工单号 */ - @Excel(name = "工单号") - private String workOrderNumber; - - /** 客户代码 */ - @Excel(name = "客户代码") - private String enterpriseCode; - - /** 客户名称 */ - @Excel(name = "客户名称") - private String enterpriseName; - - /** 送货人 */ - @Excel(name = "送货人") - private String deliveryMan; - - /** 仓库号 */ - @Excel(name = "仓库号") - private String stockNumber; - - /** 仓库名称 */ - @Excel(name = "仓库名称") - private String stockName; - - /** 仓库管理员 */ - @Excel(name = "仓库管理员") - private String stockManager; - - /** 入库日期 */ - @Excel(name = "入库日期") - private String warehousingDate; - - /** 入库类型 */ - @Excel(name = "入库类型") - private String warehousingType; - - /** 备注 */ - @Excel(name = "备注") - private String remarks; - - /** 成品代码 */ - @Excel(name = "成品代码") - private String finishProductCode; - - /** 成品名称 */ - @Excel(name = "成品名称") - private String finishProductName; - - /** 规格型号 */ - @Excel(name = "规格型号") - private String specificationModel; - - /** 机种 */ - @Excel(name = "机种") - private String typeMachine; - - /** 单位 */ - @Excel(name = "单位") - private String inventoryUnit; - - /** 合格数量 */ - @Excel(name = "合格数量") - private String qualifiedQuantity; - - /** 不合格数量 */ - @Excel(name = "不合格数量") - private String unqualifiedQuantity; - - /** 合格率 */ - @Excel(name = "合格率") - private String passRate; - - /** 说明 */ - @Excel(name = "说明") - private String description; - - /** 批号 */ - @Excel(name = "批号") - private String batchNumber; - - - /** 确认否 */ - @Excel(name = "确认否") - private String confirmFlag; - - /** 确认人 */ - @Excel(name = "确认人") - private String confirmPerson; - - /** 确认时间 */ - @Excel(name = "确认时间") - private String confirmTime; - - /** 录入时间 */ - private String firstAddTime; - - /** 修改时间 */ - private String updateInfoTime; - - /** 备用一 */ - private String standbyOne; - - /** 备用二 */ - private String standbyTwo; - - public void setWarehousingFinishProductNoticeId(Long warehousingFinishProductNoticeId) - { - this.warehousingFinishProductNoticeId = warehousingFinishProductNoticeId; - } - - public Long getWarehousingFinishProductNoticeId() - { - return warehousingFinishProductNoticeId; - } - public void setNotificationNumber(String notificationNumber) - { - this.notificationNumber = notificationNumber; - } - - public String getNotificationNumber() - { - return notificationNumber; - } - public void setWorkOrderNumber(String workOrderNumber) - { - this.workOrderNumber = workOrderNumber; - } - - public String getWorkOrderNumber() - { - return workOrderNumber; - } - public void setEnterpriseCode(String enterpriseCode) - { - this.enterpriseCode = enterpriseCode; - } - - public String getEnterpriseCode() - { - return enterpriseCode; - } - public void setEnterpriseName(String enterpriseName) - { - this.enterpriseName = enterpriseName; - } - - public String getEnterpriseName() - { - return enterpriseName; - } - public void setDeliveryMan(String deliveryMan) - { - this.deliveryMan = deliveryMan; - } - - public String getDeliveryMan() - { - return deliveryMan; - } - public void setStockNumber(String stockNumber) - { - this.stockNumber = stockNumber; - } - - public String getStockNumber() - { - return stockNumber; - } - public void setStockName(String stockName) - { - this.stockName = stockName; - } - - public String getStockName() - { - return stockName; - } - public void setStockManager(String stockManager) - { - this.stockManager = stockManager; - } - - public String getStockManager() - { - return stockManager; - } - public void setWarehousingDate(String warehousingDate) - { - this.warehousingDate = warehousingDate; - } - - public String getWarehousingDate() - { - return warehousingDate; - } - public void setWarehousingType(String warehousingType) - { - this.warehousingType = warehousingType; - } - - public String getWarehousingType() - { - return warehousingType; - } - public void setRemarks(String remarks) - { - this.remarks = remarks; - } - - public String getRemarks() - { - return remarks; - } - public void setFinishProductCode(String finishProductCode) - { - this.finishProductCode = finishProductCode; - } - - public String getFinishProductCode() - { - return finishProductCode; - } - public void setFinishProductName(String finishProductName) - { - this.finishProductName = finishProductName; - } - - public String getFinishProductName() - { - return finishProductName; - } - public void setSpecificationModel(String specificationModel) - { - this.specificationModel = specificationModel; - } - - public String getSpecificationModel() - { - return specificationModel; - } - public void setTypeMachine(String typeMachine) - { - this.typeMachine = typeMachine; - } - - public String getTypeMachine() - { - return typeMachine; - } - public void setInventoryUnit(String inventoryUnit) - { - this.inventoryUnit = inventoryUnit; - } - - public String getInventoryUnit() - { - return inventoryUnit; - } - public void setQualifiedQuantity(String qualifiedQuantity) - { - this.qualifiedQuantity = qualifiedQuantity; - } - - public String getQualifiedQuantity() - { - return qualifiedQuantity; - } - public void setUnqualifiedQuantity(String unqualifiedQuantity) - { - this.unqualifiedQuantity = unqualifiedQuantity; - } - - public String getUnqualifiedQuantity() - { - return unqualifiedQuantity; - } - public void setPassRate(String passRate) - { - this.passRate = passRate; - } - - public String getPassRate() - { - return passRate; - } - public void setDescription(String description) - { - this.description = description; - } - - public String getDescription() - { - return description; - } - public void setBatchNumber(String batchNumber) - { - this.batchNumber = batchNumber; - } - - public String getBatchNumber() - { - return batchNumber; - } - - public String getConfirmFlag() { - return confirmFlag; - } - - public void setConfirmFlag(String confirmFlag) { - this.confirmFlag = confirmFlag; - } - - public String getConfirmPerson() { - return confirmPerson; - } - - public void setConfirmPerson(String confirmPerson) { - this.confirmPerson = confirmPerson; - } - - public String getConfirmTime() { - return confirmTime; - } - - public void setConfirmTime(String confirmTime) { - this.confirmTime = confirmTime; - } - - public void setFirstAddTime(String firstAddTime) - { - this.firstAddTime = firstAddTime; - } - - public String getFirstAddTime() - { - return firstAddTime; - } - public void setUpdateInfoTime(String updateInfoTime) - { - this.updateInfoTime = updateInfoTime; - } - - public String getUpdateInfoTime() - { - return updateInfoTime; - } - public void setStandbyOne(String standbyOne) - { - this.standbyOne = standbyOne; - } - - public String getStandbyOne() - { - return standbyOne; - } - public void setStandbyTwo(String standbyTwo) - { - this.standbyTwo = standbyTwo; - } - - public String getStandbyTwo() - { - return standbyTwo; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("warehousingFinishProductNoticeId", getWarehousingFinishProductNoticeId()) - .append("notificationNumber", getNotificationNumber()) - .append("workOrderNumber", getWorkOrderNumber()) - .append("enterpriseCode", getEnterpriseCode()) - .append("enterpriseName", getEnterpriseName()) - .append("deliveryMan", getDeliveryMan()) - .append("stockNumber", getStockNumber()) - .append("stockName", getStockName()) - .append("stockManager", getStockManager()) - .append("warehousingDate", getWarehousingDate()) - .append("warehousingType", getWarehousingType()) - .append("remarks", getRemarks()) - .append("finishProductCode", getFinishProductCode()) - .append("finishProductName", getFinishProductName()) - .append("specificationModel", getSpecificationModel()) - .append("typeMachine", getTypeMachine()) - .append("inventoryUnit", getInventoryUnit()) - .append("qualifiedQuantity", getQualifiedQuantity()) - .append("unqualifiedQuantity", getUnqualifiedQuantity()) - .append("passRate", getPassRate()) - .append("description", getDescription()) - .append("batchNumber", getBatchNumber()) - .append("confirmFlag", getConfirmFlag()) - .append("confirmPerson", getConfirmPerson()) - .append("confirmTime", getConfirmTime()) - .append("firstAddTime", getFirstAddTime()) - .append("updateInfoTime", getUpdateInfoTime()) - .append("standbyOne", getStandbyOne()) - .append("standbyTwo", getStandbyTwo()) - .toString(); - } -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/manufacture/mapper/WarehousingFinishProductNoticeMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/manufacture/mapper/WarehousingFinishProductNoticeMapper.java deleted file mode 100644 index 2a59ca71..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/manufacture/mapper/WarehousingFinishProductNoticeMapper.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.ruoyi.manufacture.mapper; - -import com.ruoyi.manufacture.domain.WarehousingFinishProductNotice; - -import java.util.List; - -/** - * 成品入库通知Mapper接口 - * - * @author ruoyi - * @date 2023-04-24 - */ -public interface WarehousingFinishProductNoticeMapper -{ - /** - * 查询成品入库通知 - * - * @param warehousingFinishProductNoticeId 成品入库通知ID - * @return 成品入库通知 - */ - public WarehousingFinishProductNotice selectWarehousingFinishProductNoticeById(Long warehousingFinishProductNoticeId); - - /** - * 查询成品入库通知列表 - * - * @param warehousingFinishProductNotice 成品入库通知 - * @return 成品入库通知集合 - */ - public List selectWarehousingFinishProductNoticeList(WarehousingFinishProductNotice warehousingFinishProductNotice); - - /** - * 新增成品入库通知 - * - * @param warehousingFinishProductNotice 成品入库通知 - * @return 结果 - */ - public int insertWarehousingFinishProductNotice(WarehousingFinishProductNotice warehousingFinishProductNotice); - - /** - * 修改成品入库通知 - * - * @param warehousingFinishProductNotice 成品入库通知 - * @return 结果 - */ - public int updateWarehousingFinishProductNotice(WarehousingFinishProductNotice warehousingFinishProductNotice); - - /** - * 删除成品入库通知 - * - * @param warehousingFinishProductNoticeId 成品入库通知ID - * @return 结果 - */ - public int deleteWarehousingFinishProductNoticeById(Long warehousingFinishProductNoticeId); - - /** - * 批量删除成品入库通知 - * - * @param warehousingFinishProductNoticeIds 需要删除的数据ID - * @return 结果 - */ - public int deleteWarehousingFinishProductNoticeByIds(String[] warehousingFinishProductNoticeIds); - - public List selectByIdDesc(); -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/manufacture/service/IWarehousingFinishProductNoticeService.java b/ruoyi-admin/src/main/java/com/ruoyi/manufacture/service/IWarehousingFinishProductNoticeService.java deleted file mode 100644 index f6a79447..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/manufacture/service/IWarehousingFinishProductNoticeService.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.ruoyi.manufacture.service; - -import com.ruoyi.manufacture.domain.WarehousingFinishProductNotice; - -import java.util.List; - -/** - * 成品入库通知Service接口 - * - * @author ruoyi - * @date 2023-04-24 - */ -public interface IWarehousingFinishProductNoticeService -{ - /** - * 查询成品入库通知 - * - * @param warehousingFinishProductNoticeId 成品入库通知ID - * @return 成品入库通知 - */ - public WarehousingFinishProductNotice selectWarehousingFinishProductNoticeById(Long warehousingFinishProductNoticeId); - - /** - * 查询成品入库通知列表 - * - * @param warehousingFinishProductNotice 成品入库通知 - * @return 成品入库通知集合 - */ - public List selectWarehousingFinishProductNoticeList(WarehousingFinishProductNotice warehousingFinishProductNotice); - - /** - * 新增成品入库通知 - * - * @param warehousingFinishProductNotice 成品入库通知 - * @return 结果 - */ - public int insertWarehousingFinishProductNotice(WarehousingFinishProductNotice warehousingFinishProductNotice); - - /** - * 修改成品入库通知 - * - * @param warehousingFinishProductNotice 成品入库通知 - * @return 结果 - */ - public int updateWarehousingFinishProductNotice(WarehousingFinishProductNotice warehousingFinishProductNotice); - - /** - * 批量删除成品入库通知 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - public int deleteWarehousingFinishProductNoticeByIds(String ids); - - /** - * 删除成品入库通知信息 - * - * @param warehousingFinishProductNoticeId 成品入库通知ID - * @return 结果 - */ - public int deleteWarehousingFinishProductNoticeById(Long warehousingFinishProductNoticeId); - - public String getId(); -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/manufacture/service/impl/WarehousingFinishProductNoticeServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/manufacture/service/impl/WarehousingFinishProductNoticeServiceImpl.java deleted file mode 100644 index 2699c76e..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/manufacture/service/impl/WarehousingFinishProductNoticeServiceImpl.java +++ /dev/null @@ -1,103 +0,0 @@ -package com.ruoyi.manufacture.service.impl; - -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.manufacture.domain.WarehousingFinishProductNotice; -import com.ruoyi.manufacture.mapper.WarehousingFinishProductNoticeMapper; -import com.ruoyi.manufacture.service.IWarehousingFinishProductNoticeService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.text.SimpleDateFormat; -import java.util.List; - -/** - * 成品入库通知Service业务层处理 - * - * @author ruoyi - * @date 2023-04-24 - */ -@Service -public class WarehousingFinishProductNoticeServiceImpl implements IWarehousingFinishProductNoticeService -{ - @Autowired - private WarehousingFinishProductNoticeMapper warehousingFinishProductNoticeMapper; - - /** - * 查询成品入库通知 - * - * @param warehousingFinishProductNoticeId 成品入库通知ID - * @return 成品入库通知 - */ - @Override - public WarehousingFinishProductNotice selectWarehousingFinishProductNoticeById(Long warehousingFinishProductNoticeId) - { - return warehousingFinishProductNoticeMapper.selectWarehousingFinishProductNoticeById(warehousingFinishProductNoticeId); - } - - /** - * 查询成品入库通知列表 - * - * @param warehousingFinishProductNotice 成品入库通知 - * @return 成品入库通知 - */ - @Override - public List selectWarehousingFinishProductNoticeList(WarehousingFinishProductNotice warehousingFinishProductNotice) - { - return warehousingFinishProductNoticeMapper.selectWarehousingFinishProductNoticeList(warehousingFinishProductNotice); - } - - /** - * 新增成品入库通知 - * - * @param warehousingFinishProductNotice 成品入库通知 - * @return 结果 - */ - @Override - public int insertWarehousingFinishProductNotice(WarehousingFinishProductNotice warehousingFinishProductNotice) - { - return warehousingFinishProductNoticeMapper.insertWarehousingFinishProductNotice(warehousingFinishProductNotice); - } - - /** - * 修改成品入库通知 - * - * @param warehousingFinishProductNotice 成品入库通知 - * @return 结果 - */ - @Override - public int updateWarehousingFinishProductNotice(WarehousingFinishProductNotice warehousingFinishProductNotice) - { - return warehousingFinishProductNoticeMapper.updateWarehousingFinishProductNotice(warehousingFinishProductNotice); - } - - /** - * 删除成品入库通知对象 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - @Override - public int deleteWarehousingFinishProductNoticeByIds(String ids) - { - return warehousingFinishProductNoticeMapper.deleteWarehousingFinishProductNoticeByIds(Convert.toStrArray(ids)); - } - - /** - * 删除成品入库通知信息 - * - * @param warehousingFinishProductNoticeId 成品入库通知ID - * @return 结果 - */ - @Override - public int deleteWarehousingFinishProductNoticeById(Long warehousingFinishProductNoticeId) - { - return warehousingFinishProductNoticeMapper.deleteWarehousingFinishProductNoticeById(warehousingFinishProductNoticeId); - } - - @Override - public String getId() { - String time = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(System.currentTimeMillis()); - return "IVCP" + time.substring(2); - } - -} 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 deleted file mode 100644 index 61772a0a..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/controller/WarehousingInInfoController.java +++ /dev/null @@ -1,649 +0,0 @@ -package com.ruoyi.storehouse.controller; - -import com.alibaba.excel.EasyExcel; -import com.alibaba.excel.ExcelWriter; -import com.alibaba.excel.util.MapUtils; -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.excel.write.style.HorizontalCellStyleStrategy; -import com.ruoyi.ck.utils.Result; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.manufacture.domain.WarehousingFinishProductNotice; -import com.ruoyi.manufacture.domain.WorkOrderInfo; -import com.ruoyi.manufacture.service.IWarehousingFinishProductNoticeService; -import com.ruoyi.manufacture.service.IWorkOrderInfoService; -import com.ruoyi.storehouse.domain.WarehousingInDetail; -import com.ruoyi.storehouse.domain.WarehousingInInfo; -import com.ruoyi.storehouse.domain.exportDto.WarehousingInDetailDto; -import com.ruoyi.storehouse.domain.exportDto.WarehousingInInfoDto; -import com.ruoyi.storehouse.service.IWarehousingInDetailService; -import com.ruoyi.storehouse.service.IWarehousingInInfoService; -import com.ruoyi.storehouse.utils.CustomRowWriteHandler; -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; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -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; -import java.util.List; -import java.util.Map; - -import static com.ruoyi.common.config.datasource.DynamicDataSourceContextHolder.log; - -/** - * 入库Controller - * - * @author ruoyi - * @date 2023-04-26 - */ -@Controller -@RequestMapping("/storehouse/warehousingInInfo") -public class WarehousingInInfoController extends BaseController -{ - private String prefix = "storehouse/warehousingInInfo"; - private String prefixRaw = "storehouse/warehousingInRawMaterial"; - private String prefixSubsidiary = "storehouse/warehousingInSubsidiary"; - private String prefixFinishProduct = "storehouse/warehousingInFinishProduct"; - private String prefixRGFinishProduct = "storehouse/warehousingInRGFinishProduct"; - private String prefixPDFinishProduct = "storehouse/warehousingInPDFinishProduct"; - private String prefixPDBcp = "storehouse/warehousingInPDBcp"; - - @Autowired - private IWarehousingInInfoService warehousingInInfoService; - - @Autowired - private IWarehousingInDetailService warehousingInDetailService; - @Autowired - private IWarehousingFinishProductNoticeService warehousingFinishProductNoticeService; - @Autowired - private IWorkOrderInfoService workOrderInfoService; - - //excel数据量 - private Integer excelSize = 9; - /** - * 页面跳转 - * @return - */ -// @RequiresPermissions("storehouse:warehousingInInfo:view") -// @GetMapping() -// public String warehousingInInfo() -// { -// return prefix + "/warehousingInInfo"; -// } - - @RequiresPermissions("storehouse:warehousingInInfo:viewRaw") - @GetMapping ("/viewRaw") - public String warehousingInRawMaterial() - { - return prefixRaw + "/warehousingInRawMaterial"; - } - - @RequiresPermissions("storehouse:warehousingInInfo:viewSubsidiary") - @GetMapping("/viewSubsidiary") - public String warehousingInSubsidiary() - { - return prefixSubsidiary + "/warehousingInSubsidiary"; - } - - @RequiresPermissions("storehouse:warehousingInInfo:viewFinishProduct") - @GetMapping("/viewFinishProduct") - public String warehousingInFinishProduct() - { - return prefixFinishProduct + "/warehousingInFinishProduct"; - } - - @RequiresPermissions("storehouse:warehousingInInfo:viewRGFinishProduct") - @GetMapping("/viewRGFinishProduct") - public String warehousingInRGFinishProduct() - { - return prefixRGFinishProduct + "/warehousingInRGFinishProduct"; - } - - @RequiresPermissions("storehouse:warehousingInInfo:viewPDFinishProduct") - @GetMapping("/viewPDFinishProduct") - public String warehousingInPDFinishProduct() - { - return prefixPDFinishProduct + "/warehousingInPDFinishProduct"; - } - @RequiresPermissions("storehouse:warehousingInInfo:viewPDBcp") - @GetMapping("/viewPDBcp") - public String warehousingInPDBcp() - { - return prefixPDBcp + "/warehousingInPDBcp"; - } - - -// @RequiresPermissions("storehouse:warehousingInInfo:list") -// @PostMapping("/list") -// @ResponseBody -// public TableDataInfo list(WarehousingInInfo warehousingInInfo) -// { -// startPage(); -// List list = warehousingInInfoService.selectWarehousingInInfoList(warehousingInInfo); -// return getDataTable(list); -// } - - /** - * 查询入库列表 - */ - @RequiresPermissions("storehouse:warehousingInInfo:listRaw") - @PostMapping("/listRaw") - @ResponseBody - public TableDataInfo listRaw(WarehousingInInfo warehousingInInfo) - { - startPage(); - List list = warehousingInInfoService.selectWarehousingInRawMaterialByNumber(warehousingInInfo); - return getDataTable(list); - } - @RequiresPermissions("storehouse:warehousingInInfo:listSubsidiary") - @PostMapping("/listSubsidiary") - @ResponseBody - public TableDataInfo listSubsidiary(WarehousingInInfo warehousingInInfo) - { - startPage(); - List list = warehousingInInfoService.selectWarehousingInSubsidiaryByNumber(warehousingInInfo); - return getDataTable(list); - } - @RequiresPermissions("storehouse:warehousingInInfo:listFinishProduct") - @PostMapping("/listFinishProduct") - @ResponseBody - public TableDataInfo listFinishProduct(WarehousingInInfo warehousingInInfo) - { - startPage(); - List list = warehousingInInfoService.selectWarehousingInFinishProductByNumber(warehousingInInfo); - return getDataTable(list); - } - @RequiresPermissions("storehouse:warehousingInInfo:listRGFinishProduct") - @PostMapping("/listRGFinishProduct") - @ResponseBody - public TableDataInfo listRGFinishProduct(WarehousingInInfo warehousingInInfo) - { - startPage(); - List list = warehousingInInfoService.selectWarehousingInRGFinishProductByNumber(warehousingInInfo); - return getDataTable(list); - } - @RequiresPermissions("storehouse:warehousingInInfo:listPDFinishProduct") - @PostMapping("/listPDFinishProduct") - @ResponseBody - public TableDataInfo listPDFinishProduct(WarehousingInInfo warehousingInInfo) - { - startPage(); - 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); - } - - /** - * 导出入库列表 - */ - @RequiresPermissions("storehouse:warehousingInInfo:export") - @Log(title = "入库", businessType = BusinessType.EXPORT) - @PostMapping("/export") - @ResponseBody - public AjaxResult export(WarehousingInInfo warehousingInInfo) - { - List list = warehousingInInfoService.selectWarehousingInInfoList(warehousingInInfo); - ExcelUtil util = new ExcelUtil(WarehousingInInfo.class); - return util.exportExcel(list, "入库数据"); - } - - /** - * 新增入库 - */ - @GetMapping("/add") - public String add() - { - return prefix + "/add"; - } - @GetMapping("/addRaw") - public String addRaw() - { - return prefixRaw + "/add"; - } - @GetMapping("/addSubsidiary") - public String addSubsidiary() - { - return prefixSubsidiary + "/add"; - } - @GetMapping("/addFinishProduct") - public String addFinishProduct() - { - return prefixFinishProduct + "/add"; - } - @GetMapping("/addRGFinishProduct") - public String addRGFinishProduct() - { - return prefixRGFinishProduct + "/add"; - } - @GetMapping("/addPDFinishProduct") - public String addPDFinishProduct() - { - return prefixPDFinishProduct + "/add"; - } - @GetMapping("/addPDBcp") - public String addPDBcp() - { - return prefixPDBcp + "/add"; - } - - /** - * 新增保存入库 - */ - @RequiresPermissions("storehouse:warehousingInInfo:add") - @Log(title = "入库", businessType = BusinessType.INSERT) - @PostMapping("/add") - @ResponseBody - public AjaxResult addSave(WarehousingInInfo warehousingInInfo) - { - return toAjax(warehousingInInfoService.insertWarehousingInInfo(warehousingInInfo)); - } - - /** - * 修改入库 - */ - @GetMapping("/editRaw/{warehousingInfoId}") - public String editRaw(@PathVariable("warehousingInfoId") Long warehousingInfoId, ModelMap mmap) - { - WarehousingInInfo warehousingInInfo = warehousingInInfoService.selectWarehousingInInfoById(warehousingInfoId); - mmap.put("warehousingInInfo", warehousingInInfo); - return prefixRaw + "/edit"; - } - @GetMapping("/editSubsidiary/{warehousingInfoId}") - public String editSubsidiary(@PathVariable("warehousingInfoId") Long warehousingInfoId, ModelMap mmap) - { - WarehousingInInfo warehousingInInfo = warehousingInInfoService.selectWarehousingInInfoById(warehousingInfoId); - mmap.put("warehousingInInfo", warehousingInInfo); - return prefixSubsidiary + "/edit"; - } - @GetMapping("/editFinishProduct/{warehousingInfoId}") - public String editFinishProduct(@PathVariable("warehousingInfoId") Long warehousingInfoId, ModelMap mmap) - { - WarehousingInInfo warehousingInInfo = warehousingInInfoService.selectWarehousingInInfoById(warehousingInfoId); - mmap.put("warehousingInInfo", warehousingInInfo); - return prefixFinishProduct + "/edit"; - } - @GetMapping("/editRGFinishProduct/{warehousingInfoId}") - public String editRGFinishProduct(@PathVariable("warehousingInfoId") Long warehousingInfoId, ModelMap mmap) - { - WarehousingInInfo warehousingInInfo = warehousingInInfoService.selectWarehousingInInfoById(warehousingInfoId); - mmap.put("warehousingInInfo", warehousingInInfo); - return prefixRGFinishProduct + "/edit"; - } - @GetMapping("/editPDFinishProduct/{warehousingInfoId}") - public String editPDFinishProduct(@PathVariable("warehousingInfoId") Long warehousingInfoId, ModelMap mmap) - { - WarehousingInInfo warehousingInInfo = warehousingInInfoService.selectWarehousingInInfoById(warehousingInfoId); - 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"; - } - - /** - * 修改保存入库 - */ - @RequiresPermissions("storehouse:warehousingInInfo:edit") - @Log(title = "入库", businessType = BusinessType.UPDATE) - @PostMapping("/edit") - @ResponseBody - public AjaxResult editSave(WarehousingInInfo warehousingInInfo) - { - return toAjax(warehousingInInfoService.updateWarehousingInInfo(warehousingInInfo)); - } - - /** - * 删除入库 - */ - @RequiresPermissions("storehouse:warehousingInInfo:remove") - @Log(title = "入库", businessType = BusinessType.DELETE) - @PostMapping( "/remove") - @ResponseBody - public AjaxResult remove(String ids) - { - return toAjax(warehousingInInfoService.deleteWarehousingInInfoByIds(ids)); - } - - - /** - * 获取订单id - * @return - * @throws Exception - */ - @PostMapping("/getRawId") - @ResponseBody - public Result getRawId() throws Exception { - return Result.getSuccessResult(warehousingInInfoService.getRawId()); - } - @PostMapping("/getSubsidiaryId") - @ResponseBody - public Result getSubsidiaryId() throws Exception { - return Result.getSuccessResult(warehousingInInfoService.getSubsidiaryId()); - } - @PostMapping("/getFinishProductId") - @ResponseBody - public Result getFinishProductId() throws Exception { - return Result.getSuccessResult(warehousingInInfoService.getFinishProductId()); - } - @PostMapping("/getRGFinishProductId") - @ResponseBody - public Result getRGFinishProductId() throws Exception { - return Result.getSuccessResult(warehousingInInfoService.getRGFinishProductId()); - } - @PostMapping("/getPDFinishProductId") - @ResponseBody - 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) - @RequestMapping( "/removeSelected") - @ResponseBody - public String removeSelected(@RequestParam(value = "ids") String ids) { - System.out.println(ids); - String[] idsStr = ids.split(","); - for (int i = 0; i< idsStr.length; i++) { - WarehousingInInfo warehousingInInfo = warehousingInInfoService.selectWarehousingInInfoById(Long.valueOf(idsStr[i])); - WarehousingInDetail warehousingInDetail = new WarehousingInDetail(); - warehousingInDetail.setWarehousingNumber(warehousingInInfo.getWarehousingNumber()); - List list = warehousingInDetailService.selectWarehousingInDetailList(warehousingInDetail); - if (list.size()>0) { - for (int j=0;j warehousingInDetailList = warehousingInDetailService.selectWarehousingInDetailList(warehousingInDetail); - List warehousingInDetailDtoList = new ArrayList<>(); - try { - int number = 0; - Iterator values= warehousingInDetailList.iterator(); - while(values.hasNext()) { - Object source = values.next(); - WarehousingInDetailDto target = WarehousingInDetailDto.class.newInstance(); - BeanUtils.copyProperties(source, target); - mergePrevColUtils.add(number+4,1,1); - mergePrevColUtils.add(number+4,3,1); - target.setNumber(++number); - warehousingInDetailDtoList.add(target); - } - }catch (Exception e) { - log.error(">>>>>>异常<<<<<<", e); - } - System.out.println(warehousingInDetailDtoList); - - 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\\原料入库单.xlsx"; - try (ExcelWriter excelWriter = EasyExcel - .write(response.getOutputStream(), WarehousingInDetailDto.class) - .withTemplate(templateFileName) - .registerWriteHandler(mergePrevColUtils) - //样式注册 - .registerWriteHandler(horizontalCellStyleStrategyBuilder()) - .build()) { - WriteSheet writeSheet = EasyExcel.writerSheet().build(); - FillConfig fillConfig = FillConfig.builder().forceNewRow(Boolean.TRUE).build(); - excelWriter.fill(warehousingInDetailDtoList, fillConfig, writeSheet); - Map map = MapUtils.newHashMap(); -// map.put("date", DateTimeFormatter.ofPattern("yyyy/MM/dd").format(LocalDateTime.now())); - map.put("purchaseOrderNumber", warehousingInInfoDto.getPurchaseOrderNumber()); - map.put("warehousingNumber", warehousingInInfoDto.getWarehousingNumber()); - map.put("supplierName", warehousingInInfoDto.getSupplierName()); - map.put("warehousingDate", warehousingInInfoDto.getWarehousingDate()); - map.put("documentPreparationPersonnel", warehousingInInfoDto.getDocumentPreparationPersonnel()); - excelWriter.fill(map, writeSheet); - } - } - - /** - * 导出辅料入库单 - */ - @RequiresPermissions("storehouse:warehousingInInfo:export") - @Log(title = "入库", businessType = BusinessType.EXPORT) - @RequestMapping("/exportSelectedSubsidiary/{warehousingInfoId}") - @ResponseBody - public void exportSelectedSubsidiary(@PathVariable("warehousingInfoId") Long warehousingInfoId, HttpServletResponse response) throws IOException { -// - - System.out.println(warehousingInfoId); - WarehousingInInfo warehousingInInfo = warehousingInInfoService.selectWarehousingInInfoById(warehousingInfoId); - WarehousingInInfoDto warehousingInInfoDto = new WarehousingInInfoDto(); - BeanUtils.copyProperties(warehousingInInfo,warehousingInInfoDto); - - WarehousingInDetail warehousingInDetail= new WarehousingInDetail(); - warehousingInDetail.setWarehousingNumber(warehousingInInfo.getWarehousingNumber()); - - // 创建列合并工具类对象 - ExcelFillCellMergePrevColUtils mergePrevColUtils = new ExcelFillCellMergePrevColUtils(); - - List warehousingInDetailList = warehousingInDetailService.selectWarehousingInDetailList(warehousingInDetail); - List warehousingInDetailDtoList = new ArrayList<>(); - try { - int number = 0; - Iterator values= warehousingInDetailList.iterator(); - while(values.hasNext()) { - Object source = values.next(); - WarehousingInDetailDto target = WarehousingInDetailDto.class.newInstance(); - BeanUtils.copyProperties(source, target); - mergePrevColUtils.add(number+4,1,1); - mergePrevColUtils.add(number+4,3,1); - target.setNumber(++number); - warehousingInDetailDtoList.add(target); - } - }catch (Exception e) { - log.error(">>>>>>异常<<<<<<", e); - } - System.out.println(warehousingInDetailDtoList); - - 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\\辅料入库单.xlsx"; - try (ExcelWriter excelWriter = EasyExcel - .write(response.getOutputStream(), WarehousingInDetailDto.class) - .withTemplate(templateFileName) - .registerWriteHandler(mergePrevColUtils) - //样式注册 - .registerWriteHandler(horizontalCellStyleStrategyBuilder()) - .build()) { - WriteSheet writeSheet = EasyExcel.writerSheet().build(); - FillConfig fillConfig = FillConfig.builder().forceNewRow(Boolean.TRUE).build(); - excelWriter.fill(warehousingInDetailDtoList, fillConfig, writeSheet); - Map map = MapUtils.newHashMap(); -// map.put("date", DateTimeFormatter.ofPattern("yyyy/MM/dd").format(LocalDateTime.now())); - map.put("purchaseOrderNumber", warehousingInInfoDto.getPurchaseOrderNumber()); - map.put("warehousingNumber", warehousingInInfoDto.getWarehousingNumber()); - map.put("supplierName", warehousingInInfoDto.getSupplierName()); - map.put("warehousingDate", warehousingInInfoDto.getWarehousingDate()); - map.put("documentPreparationPersonnel", warehousingInInfoDto.getDocumentPreparationPersonnel()); - excelWriter.fill(map, writeSheet); - } - } - - /** - * 导出成品入库单 - */ - @RequiresPermissions("storehouse:warehousingInInfo:export") - @Log(title = "入库", businessType = BusinessType.EXPORT) - @RequestMapping("/exportSelectedFinishProduct/{warehousingInfoId}") - @ResponseBody - public void exportSelectedFinishProduct(@PathVariable("warehousingInfoId") Long warehousingInfoId, HttpServletResponse response) throws IOException { -// - -// System.out.println(warehousingInfoId); - WarehousingInInfo warehousingInInfo = warehousingInInfoService.selectWarehousingInInfoById(warehousingInfoId); - WarehousingInInfoDto warehousingInInfoDto = new WarehousingInInfoDto(); - BeanUtils.copyProperties(warehousingInInfo,warehousingInInfoDto); - - WarehousingInDetail warehousingInDetail= new WarehousingInDetail(); - warehousingInDetail.setWarehousingNumber(warehousingInInfo.getWarehousingNumber()); - - // 创建列合并工具类对象 - ExcelFillCellMergePrevColUtils mergePrevColUtils = new ExcelFillCellMergePrevColUtils(); - - List warehousingInDetailList = warehousingInDetailService.selectWarehousingInDetailList(warehousingInDetail); - List warehousingInDetailDtoList = new ArrayList<>(); - try { - int number = 0; - Iterator values= warehousingInDetailList.iterator(); - while(values.hasNext()) { - Object source = values.next(); - WarehousingInDetailDto target = WarehousingInDetailDto.class.newInstance(); - BeanUtils.copyProperties(source, target); - mergePrevColUtils.add(number+7,1,1); - WorkOrderInfo workOrderInfo = new WorkOrderInfo(); - workOrderInfo.setWorkOrderNumber(warehousingInInfo.getWorkOrderNumber()); - List workOrderInfoList = workOrderInfoService.selectWorkOrderInfoList(workOrderInfo); - WarehousingFinishProductNotice warehousingFinishProductNotice = new WarehousingFinishProductNotice(); - warehousingFinishProductNotice.setWorkOrderNumber(warehousingInInfo.getWorkOrderNumber()); - List warehousingFinishProductNoticeList = warehousingFinishProductNoticeService.selectWarehousingFinishProductNoticeList(warehousingFinishProductNotice); - target.setSalesOrderNumber(workOrderInfoList.get(0).getSalesOrderNumber()); - 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"); - warehousingInDetailDtoList.add(target); - } - int size = warehousingInDetailDtoList.size(); - if (warehousingInDetailDtoList.size()>>>>>异常<<<<<<", e); - } -// System.out.println(warehousingInDetailDtoList); - - for (int i=0;i map = MapUtils.newHashMap(); -// map.put("date", DateTimeFormatter.ofPattern("yyyy-MM-dd").format(LocalDateTime.now())); - excelWriter.fill(map, writeSheet); - } - } - - public HorizontalCellStyleStrategy horizontalCellStyleStrategyBuilder() { - WriteCellStyle headWriteCellStyle = new WriteCellStyle(); - //设置头字体 - WriteFont headWriteFont = new WriteFont(); - headWriteFont.setFontHeightInPoints((short) 13); - headWriteFont.setBold(true); - headWriteCellStyle.setWriteFont(headWriteFont); - //设置头居中 - headWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER); - - //内容策略 - WriteCellStyle contentWriteCellStyle = new WriteCellStyle(); - //设置 水平居中 - contentWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER); - //垂直居中 - contentWriteCellStyle.setVerticalAlignment(VerticalAlignment.CENTER); - //单元格边框 - contentWriteCellStyle.setBorderTop(BorderStyle.THIN); - contentWriteCellStyle.setBorderLeft(BorderStyle.THIN); - contentWriteCellStyle.setBorderRight(BorderStyle.THIN); - contentWriteCellStyle.setBorderBottom(BorderStyle.THIN); - - return new HorizontalCellStyleStrategy(headWriteCellStyle, contentWriteCellStyle); - } - - -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/domain/WarehousingInInfo.java b/ruoyi-admin/src/main/java/com/ruoyi/storehouse/domain/WarehousingInInfo.java deleted file mode 100644 index a5aafe9e..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/domain/WarehousingInInfo.java +++ /dev/null @@ -1,397 +0,0 @@ -package com.ruoyi.storehouse.domain; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; - -/** - * 入库对象 warehousing_in_info - * - * @author ruoyi - * @date 2023-04-26 - */ -public class WarehousingInInfo extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 入库id */ - private Long warehousingInfoId; - - /** 入库单号 */ - @Excel(name = "入库单号") - private String warehousingNumber; - - /** 暂收单号 */ - @Excel(name = "暂收单号") - private String inNoticeNumber; - - /** 入库类型 */ - @Excel(name = "入库类型") - private String warehousingCategory; - - /** 采购订单号 */ - @Excel(name = "采购订单号") - private String purchaseOrderNumber; - - /** 联系人 */ - @Excel(name = "联系人") - private String contacts; - - /** 入库日期 */ - @Excel(name = "入库日期") - private String warehousingDate; - - /** 供应商代码 */ - @Excel(name = "供应商代码") - private String supplierCode; - - /** 供应商名称 */ - @Excel(name = "供应商名称") - private String supplierName; - - /** 制单人员 */ - @Excel(name = "制单人员") - private String documentPreparationPersonnel; - - /** 仓库号 */ - @Excel(name = "仓库号") - private String stockNumber; - - /** 仓库名称 */ - @Excel(name = "仓库名称") - private String stockName; - - /** 仓库管理员 */ - @Excel(name = "仓库管理员") - private String stockManager; - - /** 内外销 */ - @Excel(name = "内外销") - private String exportSales; - - /** 备注 */ - @Excel(name = "备注") - private String remarks; - - /** 送货人 */ - @Excel(name = "送货人") - private String deliveryMan; - - /** 退货单号 */ - @Excel(name = "退货单号") - private String returnGoodsNumber; - - /** 客户代码 */ - @Excel(name = "客户代码") - private String enterpriseCode; - - /** 客户名称 */ - @Excel(name = "客户名称") - private String enterpriseName; - - /** 入库通知单号 */ - @Excel(name = "入库通知单号") - private String notificationNumber; - - /** 工单号 */ - @Excel(name = "工单号") - private String workOrderNumber; - - /** 部门编号 */ - @Excel(name = "部门编号") - private String deptCode; - - /** 部门名称 */ - @Excel(name = "部门名称") - private String deptName; - - /** 录入时间 */ - private String firstAddTime; - - /** 修改时间 */ - private String updateInfoTime; - - /** 入库方式 */ - private String warehousingInWay; - - /** 备用二 */ - private String standbyTwo; - - public void setWarehousingInfoId(Long warehousingInfoId) - { - this.warehousingInfoId = warehousingInfoId; - } - - public Long getWarehousingInfoId() - { - return warehousingInfoId; - } - public void setWarehousingNumber(String warehousingNumber) - { - this.warehousingNumber = warehousingNumber; - } - - public String getWarehousingNumber() - { - return warehousingNumber; - } - public void setInNoticeNumber(String inNoticeNumber) - { - this.inNoticeNumber = inNoticeNumber; - } - - public String getInNoticeNumber() - { - return inNoticeNumber; - } - public void setWarehousingCategory(String warehousingCategory) - { - this.warehousingCategory = warehousingCategory; - } - - public String getWarehousingCategory() - { - return warehousingCategory; - } - public void setPurchaseOrderNumber(String purchaseOrderNumber) - { - this.purchaseOrderNumber = purchaseOrderNumber; - } - - public String getPurchaseOrderNumber() - { - return purchaseOrderNumber; - } - public void setContacts(String contacts) - { - this.contacts = contacts; - } - - public String getContacts() - { - return contacts; - } - public void setWarehousingDate(String warehousingDate) - { - this.warehousingDate = warehousingDate; - } - - public String getWarehousingDate() - { - return warehousingDate; - } - public void setSupplierCode(String supplierCode) - { - this.supplierCode = supplierCode; - } - - public String getSupplierCode() - { - return supplierCode; - } - public void setSupplierName(String supplierName) - { - this.supplierName = supplierName; - } - - public String getSupplierName() - { - return supplierName; - } - public void setDocumentPreparationPersonnel(String documentPreparationPersonnel) - { - this.documentPreparationPersonnel = documentPreparationPersonnel; - } - - public String getDocumentPreparationPersonnel() - { - return documentPreparationPersonnel; - } - public void setStockNumber(String stockNumber) - { - this.stockNumber = stockNumber; - } - - public String getStockNumber() - { - return stockNumber; - } - public void setStockName(String stockName) - { - this.stockName = stockName; - } - - public String getStockName() - { - return stockName; - } - public void setStockManager(String stockManager) - { - this.stockManager = stockManager; - } - - public String getStockManager() - { - return stockManager; - } - public void setExportSales(String exportSales) - { - this.exportSales = exportSales; - } - - public String getExportSales() - { - return exportSales; - } - public void setRemarks(String remarks) - { - this.remarks = remarks; - } - - public String getRemarks() - { - return remarks; - } - public void setDeliveryMan(String deliveryMan) - { - this.deliveryMan = deliveryMan; - } - - public String getDeliveryMan() - { - return deliveryMan; - } - public void setReturnGoodsNumber(String returnGoodsNumber) - { - this.returnGoodsNumber = returnGoodsNumber; - } - - public String getReturnGoodsNumber() - { - return returnGoodsNumber; - } - public void setEnterpriseCode(String enterpriseCode) - { - this.enterpriseCode = enterpriseCode; - } - - public String getEnterpriseCode() - { - return enterpriseCode; - } - public void setEnterpriseName(String enterpriseName) - { - this.enterpriseName = enterpriseName; - } - - public String getEnterpriseName() - { - return enterpriseName; - } - public void setNotificationNumber(String notificationNumber) - { - this.notificationNumber = notificationNumber; - } - - public String getNotificationNumber() - { - return notificationNumber; - } - public void setWorkOrderNumber(String workOrderNumber) - { - this.workOrderNumber = workOrderNumber; - } - - public String getWorkOrderNumber() - { - return workOrderNumber; - } - public void setDeptCode(String deptCode) - { - this.deptCode = deptCode; - } - - public String getDeptCode() - { - return deptCode; - } - public void setDeptName(String deptName) - { - this.deptName = deptName; - } - - public String getDeptName() - { - return deptName; - } - public void setFirstAddTime(String firstAddTime) - { - this.firstAddTime = firstAddTime; - } - - public String getFirstAddTime() - { - return firstAddTime; - } - public void setUpdateInfoTime(String updateInfoTime) - { - this.updateInfoTime = updateInfoTime; - } - - public String getUpdateInfoTime() - { - return updateInfoTime; - } - - public String getWarehousingInWay() { - return warehousingInWay; - } - - public void setWarehousingInWay(String warehousingInWay) { - this.warehousingInWay = warehousingInWay; - } - - public void setStandbyTwo(String standbyTwo) - { - this.standbyTwo = standbyTwo; - } - - public String getStandbyTwo() - { - return standbyTwo; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("warehousingInfoId", getWarehousingInfoId()) - .append("warehousingNumber", getWarehousingNumber()) - .append("inNoticeNumber", getInNoticeNumber()) - .append("warehousingCategory", getWarehousingCategory()) - .append("purchaseOrderNumber", getPurchaseOrderNumber()) - .append("contacts", getContacts()) - .append("warehousingDate", getWarehousingDate()) - .append("supplierCode", getSupplierCode()) - .append("supplierName", getSupplierName()) - .append("documentPreparationPersonnel", getDocumentPreparationPersonnel()) - .append("stockNumber", getStockNumber()) - .append("stockName", getStockName()) - .append("stockManager", getStockManager()) - .append("exportSales", getExportSales()) - .append("remarks", getRemarks()) - .append("deliveryMan", getDeliveryMan()) - .append("returnGoodsNumber", getReturnGoodsNumber()) - .append("enterpriseCode", getEnterpriseCode()) - .append("enterpriseName", getEnterpriseName()) - .append("notificationNumber", getNotificationNumber()) - .append("workOrderNumber", getWorkOrderNumber()) - .append("deptCode", getDeptCode()) - .append("deptName", getDeptName()) - .append("firstAddTime", getFirstAddTime()) - .append("updateInfoTime", getUpdateInfoTime()) - .append("warehousingInWay", getWarehousingInWay()) - .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 deleted file mode 100644 index 2120fc0f..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/mapper/WarehousingInInfoMapper.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.ruoyi.storehouse.mapper; - -import com.ruoyi.storehouse.domain.WarehousingInInfo; - -import java.util.List; - -/** - * 入库Mapper接口 - * - * @author ruoyi - * @date 2023-04-26 - */ -public interface WarehousingInInfoMapper -{ - /** - * 查询入库 - * - * @param warehousingInfoId 入库ID - * @return 入库 - */ - public WarehousingInInfo selectWarehousingInInfoById(Long warehousingInfoId); - - /** - * 查询入库列表 - * - * @param warehousingInInfo 入库 - * @return 入库集合 - */ - public List selectWarehousingInInfoList(WarehousingInInfo warehousingInInfo); - public List selectWarehousingInRawMaterialByNumber(WarehousingInInfo warehousingInInfo); - public List selectWarehousingInSubsidiaryByNumber(WarehousingInInfo warehousingInInfo); - public List selectWarehousingInFinishProductByNumber(WarehousingInInfo warehousingInInfo); - public List selectWarehousingInRGFinishProductByNumber(WarehousingInInfo warehousingInInfo); - public List selectWarehousingInPDFinishProductByNumber(WarehousingInInfo warehousingInInfo); - public List selectWarehousingInPDBcpByNumber(WarehousingInInfo warehousingInInfo); - - /** - * 新增入库 - * - * @param warehousingInInfo 入库 - * @return 结果 - */ - public int insertWarehousingInInfo(WarehousingInInfo warehousingInInfo); - - /** - * 修改入库 - * - * @param warehousingInInfo 入库 - * @return 结果 - */ - public int updateWarehousingInInfo(WarehousingInInfo warehousingInInfo); - - /** - * 删除入库 - * - * @param warehousingInfoId 入库ID - * @return 结果 - */ - public int deleteWarehousingInInfoById(Long warehousingInfoId); - - /** - * 批量删除入库 - * - * @param warehousingInfoIds 需要删除的数据ID - * @return 结果 - */ - public int deleteWarehousingInInfoByIds(String[] warehousingInfoIds); - -} - - 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 deleted file mode 100644 index d361583d..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/IWarehousingInInfoService.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.ruoyi.storehouse.service; - -import com.ruoyi.storehouse.domain.WarehousingInInfo; - -import java.util.List; - -/** - * 入库Service接口 - * - * @author ruoyi - * @date 2023-04-26 - */ -public interface IWarehousingInInfoService -{ - /** - * 查询入库 - * - * @param warehousingInfoId 入库ID - * @return 入库 - */ - public WarehousingInInfo selectWarehousingInInfoById(Long warehousingInfoId); - - /** - * 查询入库列表 - * - * @param warehousingInInfo 入库 - * @return 入库集合 - */ - public List selectWarehousingInInfoList(WarehousingInInfo warehousingInInfo); - public List selectWarehousingInRawMaterialByNumber(WarehousingInInfo warehousingInInfo); - public List selectWarehousingInSubsidiaryByNumber(WarehousingInInfo warehousingInInfo); - public List selectWarehousingInFinishProductByNumber(WarehousingInInfo warehousingInInfo); - public List selectWarehousingInRGFinishProductByNumber(WarehousingInInfo warehousingInInfo); - public List selectWarehousingInPDFinishProductByNumber(WarehousingInInfo warehousingInInfo); - public List selectWarehousingInPDBcpByNumber(WarehousingInInfo warehousingInInfo); - - /** - * 新增入库 - * - * @param warehousingInInfo 入库 - * @return 结果 - */ - public int insertWarehousingInInfo(WarehousingInInfo warehousingInInfo); - - /** - * 修改入库 - * - * @param warehousingInInfo 入库 - * @return 结果 - */ - public int updateWarehousingInInfo(WarehousingInInfo warehousingInInfo); - - /** - * 批量删除入库 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - public int deleteWarehousingInInfoByIds(String ids); - - /** - * 删除入库信息 - * - * @param warehousingInfoId 入库ID - * @return 结果 - */ - public int deleteWarehousingInInfoById(Long warehousingInfoId); - - public String getRawId(); - public String getSubsidiaryId(); - 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 deleted file mode 100644 index 696981c5..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/storehouse/service/impl/WarehousingInInfoServiceImpl.java +++ /dev/null @@ -1,158 +0,0 @@ -package com.ruoyi.storehouse.service.impl; - -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.storehouse.domain.WarehousingInInfo; -import com.ruoyi.storehouse.mapper.WarehousingInInfoMapper; -import com.ruoyi.storehouse.service.IWarehousingInInfoService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.text.SimpleDateFormat; -import java.util.List; - -/** - * 入库Service业务层处理 - * - * @author ruoyi - * @date 2023-04-26 - */ -@Service -public class WarehousingInInfoServiceImpl implements IWarehousingInInfoService -{ - @Autowired - private WarehousingInInfoMapper warehousingInInfoMapper; - - /** - * 查询入库 - * - * @param warehousingInfoId 入库ID - * @return 入库 - */ - @Override - public WarehousingInInfo selectWarehousingInInfoById(Long warehousingInfoId) - { - return warehousingInInfoMapper.selectWarehousingInInfoById(warehousingInfoId); - } - - /** - * 查询入库列表 - * - * @param warehousingInInfo 入库 - * @return 入库 - */ - @Override - public List selectWarehousingInInfoList(WarehousingInInfo warehousingInInfo) - { - return warehousingInInfoMapper.selectWarehousingInInfoList(warehousingInInfo); - } - @Override - public List selectWarehousingInRawMaterialByNumber(WarehousingInInfo warehousingInInfo) - { - return warehousingInInfoMapper.selectWarehousingInRawMaterialByNumber(warehousingInInfo); - } - @Override - public List selectWarehousingInSubsidiaryByNumber(WarehousingInInfo warehousingInInfo) - { - return warehousingInInfoMapper.selectWarehousingInSubsidiaryByNumber(warehousingInInfo); - } - @Override - public List selectWarehousingInFinishProductByNumber(WarehousingInInfo warehousingInInfo) - { - return warehousingInInfoMapper.selectWarehousingInFinishProductByNumber(warehousingInInfo); - } - @Override - public List selectWarehousingInRGFinishProductByNumber(WarehousingInInfo warehousingInInfo) - { - return warehousingInInfoMapper.selectWarehousingInRGFinishProductByNumber(warehousingInInfo); - } - @Override - public List selectWarehousingInPDFinishProductByNumber(WarehousingInInfo warehousingInInfo) - { - return warehousingInInfoMapper.selectWarehousingInPDFinishProductByNumber(warehousingInInfo); - } - @Override - public List selectWarehousingInPDBcpByNumber(WarehousingInInfo warehousingInInfo) - { - return warehousingInInfoMapper.selectWarehousingInPDBcpByNumber(warehousingInInfo); - } - - - /** - * 新增入库 - * - * @param warehousingInInfo 入库 - * @return 结果 - */ - @Override - public int insertWarehousingInInfo(WarehousingInInfo warehousingInInfo) - { - return warehousingInInfoMapper.insertWarehousingInInfo(warehousingInInfo); - } - - /** - * 修改入库 - * - * @param warehousingInInfo 入库 - * @return 结果 - */ - @Override - public int updateWarehousingInInfo(WarehousingInInfo warehousingInInfo) - { - return warehousingInInfoMapper.updateWarehousingInInfo(warehousingInInfo); - } - - /** - * 删除入库对象 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - @Override - public int deleteWarehousingInInfoByIds(String ids) - { - return warehousingInInfoMapper.deleteWarehousingInInfoByIds(Convert.toStrArray(ids)); - } - - /** - * 删除入库信息 - * - * @param warehousingInfoId 入库ID - * @return 结果 - */ - @Override - public int deleteWarehousingInInfoById(Long warehousingInfoId) - { - return warehousingInInfoMapper.deleteWarehousingInInfoById(warehousingInfoId); - } - - @Override - public String getRawId() { - String time = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(System.currentTimeMillis()); - return "YLIN" + time.substring(2); - } - @Override - public String getSubsidiaryId() { - String time = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(System.currentTimeMillis()); - return "FLIN" + time.substring(2); - } - @Override - public String getFinishProductId() { - String time = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(System.currentTimeMillis()); - return "POCP" + time.substring(2); - } - @Override - public String getRGFinishProductId() { - String time = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(System.currentTimeMillis()); - return "CPRI" + time.substring(2); - } - @Override - public String getPDFinishProductId() { - String time = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(System.currentTimeMillis()); - return "CPIN" + time.substring(2); - } - @Override - public String getPDBcpId() { - String time = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(System.currentTimeMillis()); - return "YLIN" + time.substring(2); - } -} diff --git a/ruoyi-admin/src/main/resources/mapper/manufacture/WarehousingFinishProductNoticeMapper.xml b/ruoyi-admin/src/main/resources/mapper/manufacture/WarehousingFinishProductNoticeMapper.xml deleted file mode 100644 index d60a4a39..00000000 --- a/ruoyi-admin/src/main/resources/mapper/manufacture/WarehousingFinishProductNoticeMapper.xml +++ /dev/null @@ -1,179 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select warehousing_finish_product_notice_id, notification_number, work_order_number, enterprise_code, enterprise_name, delivery_man, stock_number, stock_name, stock_manager, warehousing_date, warehousing_type, remarks, finish_product_code, finish_product_name, specification_model, type_machine, inventory_unit, qualified_quantity, unqualified_quantity, pass_rate, description, batch_number, confirm_flag, confirm_person, confirm_time, first_add_time, update_info_time, standby_one, standby_two from warehousing_finish_product_notice - - - - - - - - insert into warehousing_finish_product_notice - - warehousing_finish_product_notice_id, - notification_number, - work_order_number, - enterprise_code, - enterprise_name, - delivery_man, - stock_number, - stock_name, - stock_manager, - warehousing_date, - warehousing_type, - remarks, - finish_product_code, - finish_product_name, - specification_model, - type_machine, - inventory_unit, - qualified_quantity, - unqualified_quantity, - pass_rate, - description, - batch_number, - confirm_flag, - confirm_person, - confirm_time, - standby_one, - standby_two, - first_add_time, - - - #{warehousingFinishProductNoticeId}, - #{notificationNumber}, - #{workOrderNumber}, - #{enterpriseCode}, - #{enterpriseName}, - #{deliveryMan}, - #{stockNumber}, - #{stockName}, - #{stockManager}, - #{warehousingDate}, - #{warehousingType}, - #{remarks}, - #{finishProductCode}, - #{finishProductName}, - #{specificationModel}, - #{typeMachine}, - #{inventoryUnit}, - #{qualifiedQuantity}, - #{unqualifiedQuantity}, - #{passRate}, - #{description}, - #{batchNumber}, - #{confirmFlag}, - #{confirmPerson}, - #{confirmTime}, - #{standbyOne}, - #{standbyTwo}, - now(), - - - - - update warehousing_finish_product_notice - - notification_number = #{notificationNumber}, - work_order_number = #{workOrderNumber}, - enterprise_code = #{enterpriseCode}, - enterprise_name = #{enterpriseName}, - delivery_man = #{deliveryMan}, - stock_number = #{stockNumber}, - stock_name = #{stockName}, - stock_manager = #{stockManager}, - warehousing_date = #{warehousingDate}, - warehousing_type = #{warehousingType}, - remarks = #{remarks}, - finish_product_code = #{finishProductCode}, - finish_product_name = #{finishProductName}, - specification_model = #{specificationModel}, - type_machine = #{typeMachine}, - inventory_unit = #{inventoryUnit}, - qualified_quantity = #{qualifiedQuantity}, - unqualified_quantity = #{unqualifiedQuantity}, - pass_rate = #{passRate}, - description = #{description}, - batch_number = #{batchNumber}, - confirm_flag = #{confirmFlag}, - confirm_person = #{confirmPerson}, - confirm_time = #{confirmTime}, - standby_one = #{standbyOne}, - standby_two = #{standbyTwo}, - update_info_time = CONCAT_WS(',',NOW(),update_info_time), - - where warehousing_finish_product_notice_id = #{warehousingFinishProductNoticeId} - - - - delete from warehousing_finish_product_notice where warehousing_finish_product_notice_id = #{warehousingFinishProductNoticeId} - - - - delete from warehousing_finish_product_notice where warehousing_finish_product_notice_id in - - #{warehousingFinishProductNoticeId} - - - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/storehouse/WarehousingInInfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/storehouse/WarehousingInInfoMapper.xml deleted file mode 100644 index 21e9087c..00000000 --- a/ruoyi-admin/src/main/resources/mapper/storehouse/WarehousingInInfoMapper.xml +++ /dev/null @@ -1,236 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select warehousing_info_id, warehousing_number, in_notice_number, warehousing_category, purchase_order_number, contacts, warehousing_date, supplier_code, supplier_name, document_preparation_personnel, stock_number, stock_name, stock_manager, export_sales, remarks, delivery_man, return_goods_number, enterprise_code, enterprise_name, notification_number, work_order_number, dept_code, dept_name, first_add_time, update_info_time, warehousing_in_way, standby_two from warehousing_in_info - - - - - - - - - - - - - - - - - - - - insert into warehousing_in_info - - warehousing_number, - in_notice_number, - warehousing_category, - purchase_order_number, - contacts, - warehousing_date, - supplier_code, - supplier_name, - document_preparation_personnel, - stock_number, - stock_name, - stock_manager, - export_sales, - remarks, - delivery_man, - return_goods_number, - enterprise_code, - enterprise_name, - notification_number, - work_order_number, - dept_code, - dept_name, - warehousing_in_way, - standby_two, - first_add_time, - - - #{warehousingNumber}, - #{inNoticeNumber}, - #{warehousingCategory}, - #{purchaseOrderNumber}, - #{contacts}, - #{warehousingDate}, - #{supplierCode}, - #{supplierName}, - #{documentPreparationPersonnel}, - #{stockNumber}, - #{stockName}, - #{stockManager}, - #{exportSales}, - #{remarks}, - #{deliveryMan}, - #{returnGoodsNumber}, - #{enterpriseCode}, - #{enterpriseName}, - #{notificationNumber}, - #{workOrderNumber}, - #{deptCode}, - #{deptName}, - #{warehousingInWay}, - #{standbyTwo}, - now(), - - - - - update warehousing_in_info - - warehousing_number = #{warehousingNumber}, - in_notice_number = #{inNoticeNumber}, - warehousing_category = #{warehousingCategory}, - purchase_order_number = #{purchaseOrderNumber}, - contacts = #{contacts}, - warehousing_date = #{warehousingDate}, - supplier_code = #{supplierCode}, - supplier_name = #{supplierName}, - document_preparation_personnel = #{documentPreparationPersonnel}, - stock_number = #{stockNumber}, - stock_name = #{stockName}, - stock_manager = #{stockManager}, - export_sales = #{exportSales}, - remarks = #{remarks}, - delivery_man = #{deliveryMan}, - return_goods_number = #{returnGoodsNumber}, - enterprise_code = #{enterpriseCode}, - enterprise_name = #{enterpriseName}, - notification_number = #{notificationNumber}, - work_order_number = #{workOrderNumber}, - dept_code = #{deptCode}, - dept_name = #{deptName}, - - standby_two = #{standbyTwo}, - update_info_time = CONCAT_WS(',',NOW(),update_info_time), - - where warehousing_info_id = #{warehousingInfoId} - - - - delete from warehousing_in_info where warehousing_info_id = #{warehousingInfoId} - - - - delete from warehousing_in_info where warehousing_info_id in - - #{warehousingInfoId} - - - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/manufacture/warehousingFinishProductNotice/add.html b/ruoyi-admin/src/main/resources/templates/manufacture/warehousingFinishProductNotice/add.html deleted file mode 100644 index 40618c26..00000000 --- a/ruoyi-admin/src/main/resources/templates/manufacture/warehousingFinishProductNotice/add.html +++ /dev/null @@ -1,264 +0,0 @@ - - - - - - - - - -
-
-
- -
- -
-
-
- -
- - -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- - -
-
-
- -
- -
-
-
- -
-
- - -
-
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
- -
-
- - - - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/manufacture/warehousingFinishProductNotice/edit.html b/ruoyi-admin/src/main/resources/templates/manufacture/warehousingFinishProductNotice/edit.html deleted file mode 100644 index fd5820e6..00000000 --- a/ruoyi-admin/src/main/resources/templates/manufacture/warehousingFinishProductNotice/edit.html +++ /dev/null @@ -1,240 +0,0 @@ - - - - - - - - - -
-
- -
- -
- -
-
-
- -
- - -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- - -
-
-
- -
- -
-
-
- -
-
- - -
-
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
- - - - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/manufacture/warehousingFinishProductNotice/warehousingFinishProductNotice.html b/ruoyi-admin/src/main/resources/templates/manufacture/warehousingFinishProductNotice/warehousingFinishProductNotice.html deleted file mode 100644 index 6c48becb..00000000 --- a/ruoyi-admin/src/main/resources/templates/manufacture/warehousingFinishProductNotice/warehousingFinishProductNotice.html +++ /dev/null @@ -1,343 +0,0 @@ - - - - - - - -
-
-
-
-
-
    -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - - - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • -  搜索 -  重置 -
    • -
-
-
-
- - -
-
-
-
-
- - - - - - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInInfo/add.html b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInInfo/add.html deleted file mode 100644 index a602f59a..00000000 --- a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInInfo/add.html +++ /dev/null @@ -1,166 +0,0 @@ - - - - - - - -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
-
- - -
-
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
- - - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInInfo/edit.html b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInInfo/edit.html deleted file mode 100644 index 9a246a25..00000000 --- a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInInfo/edit.html +++ /dev/null @@ -1,167 +0,0 @@ - - - - - - - -
-
- -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
-
- - -
-
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
- - - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInInfo/warehousingInInfo.html b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInInfo/warehousingInInfo.html deleted file mode 100644 index 97129b9b..00000000 --- a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInInfo/warehousingInInfo.html +++ /dev/null @@ -1,220 +0,0 @@ - - - - - - -
-
-
-
-
-
    -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - - - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • -  搜索 -  重置 -
    • -
-
-
-
- - -
-
-
-
-
- - - - \ No newline at end of file