From ba81ea6a586b09b1c8caa7ce44e8c836dff2508b Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Fri, 18 Oct 2024 15:30:18 +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=E5=88=B6=E5=B7=A5=E5=8D=95=E5=AD=90?= =?UTF-8?q?=E8=A1=A8=E5=88=97=E8=A1=A8=E5=AF=B9=E8=B1=A1=20workorder=5Flis?= =?UTF-8?q?t=E5=92=8C=E7=B3=BB=E7=BB=9F=E4=B8=AD=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=E7=9A=84=E5=89=8D=E7=AB=AF=E6=89=80=E6=9C=89=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E5=92=8C=E5=90=8E=E7=AB=AF=E6=89=80=E6=9C=89=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=20=E5=92=8C=E5=AF=B9=E5=BA=94=E7=9A=84=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=95=B0=E6=8D=AE=20=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=97=A7=E7=89=88=E6=97=A0=E7=94=A8=E7=9A=84=E5=88=B6=E5=B7=A5?= =?UTF-8?q?=E5=AF=B9=E8=B1=A1=20workorderhead=E5=92=8C=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E4=B8=AD=E5=AF=B9=E5=BA=94=E7=9A=84=E5=89=8D=E7=AB=AF=E6=89=80?= =?UTF-8?q?=E6=9C=89=E4=BB=A3=E7=A0=81=E5=92=8C=E5=90=8E=E7=AB=AF=E6=89=80?= =?UTF-8?q?=E6=9C=89=E4=BB=A3=E7=A0=81=20=E5=92=8C=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=E7=9A=84=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 --- .../controller/WorkorderListController.java | 130 --- .../controller/WorkorderheadController.java | 162 --- .../ruoyi/produce/domain/WorkorderList.java | 353 ------ .../ruoyi/produce/domain/Workorderhead.java | 634 ----------- .../produce/mapper/WorkorderListMapper.java | 62 - .../produce/mapper/WorkorderheadMapper.java | 65 -- .../service/IWorkorderListService.java | 62 - .../service/IWorkorderheadService.java | 65 -- .../impl/WorkorderListServiceImpl.java | 95 -- .../impl/WorkorderheadServiceImpl.java | 199 ---- .../mapper/produce/WorkorderListMapper.xml | 165 --- .../mapper/produce/WorkorderheadMapper.xml | 227 ---- .../resources/templates/produce/list/add.html | 163 --- .../templates/produce/list/edit.html | 164 --- .../templates/produce/list/list.html | 253 ----- .../templates/produce/workorderhead/add.html | 1001 ----------------- .../templates/produce/workorderhead/edit.html | 916 --------------- .../produce/workorderhead/workorderhead.html | 440 -------- 18 files changed, 5156 deletions(-) delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/produce/controller/WorkorderListController.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/produce/controller/WorkorderheadController.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/produce/domain/WorkorderList.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/produce/domain/Workorderhead.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/produce/mapper/WorkorderListMapper.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/produce/mapper/WorkorderheadMapper.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/produce/service/IWorkorderListService.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/produce/service/IWorkorderheadService.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/produce/service/impl/WorkorderListServiceImpl.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/produce/service/impl/WorkorderheadServiceImpl.java delete mode 100644 ruoyi-admin/src/main/resources/mapper/produce/WorkorderListMapper.xml delete mode 100644 ruoyi-admin/src/main/resources/mapper/produce/WorkorderheadMapper.xml delete mode 100644 ruoyi-admin/src/main/resources/templates/produce/list/add.html delete mode 100644 ruoyi-admin/src/main/resources/templates/produce/list/edit.html delete mode 100644 ruoyi-admin/src/main/resources/templates/produce/list/list.html delete mode 100644 ruoyi-admin/src/main/resources/templates/produce/workorderhead/add.html delete mode 100644 ruoyi-admin/src/main/resources/templates/produce/workorderhead/edit.html delete mode 100644 ruoyi-admin/src/main/resources/templates/produce/workorderhead/workorderhead.html diff --git a/ruoyi-admin/src/main/java/com/ruoyi/produce/controller/WorkorderListController.java b/ruoyi-admin/src/main/java/com/ruoyi/produce/controller/WorkorderListController.java deleted file mode 100644 index b645971c..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/produce/controller/WorkorderListController.java +++ /dev/null @@ -1,130 +0,0 @@ -package com.ruoyi.produce.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.produce.domain.WorkorderList; -import com.ruoyi.produce.service.IWorkorderListService; -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 2021-11-12 - */ -@Controller -@RequestMapping("/produce/list") -public class WorkorderListController extends BaseController -{ - private String prefix = "produce/list"; - - @Autowired - private IWorkorderListService workorderListService; - - @RequiresPermissions("produce:list:view") - @GetMapping() - public String list() - { - return prefix + "/list"; - } - - /** - * 查询制工单子表列表列表 - */ - @RequiresPermissions("produce:list:list") - @PostMapping("/list") - @ResponseBody - public TableDataInfo list(WorkorderList workorderList) - { - startPage(); - List list = workorderListService.selectWorkorderListList(workorderList); - return getDataTable(list); - } - - /** - * 导出制工单子表列表列表 - */ - @RequiresPermissions("produce:list:export") - @Log(title = "制工单子表列表", businessType = BusinessType.EXPORT) - @PostMapping("/export") - @ResponseBody - public AjaxResult export(WorkorderList workorderList) - { - List list = workorderListService.selectWorkorderListList(workorderList); - ExcelUtil util = new ExcelUtil(WorkorderList.class); - return util.exportExcel(list, "制工单子表列表数据"); - } - - /** - * 新增制工单子表列表 - */ - @GetMapping("/add") - public String add() - { - return prefix + "/add"; - } - - /** - * 新增保存制工单子表列表 - */ - @RequiresPermissions("produce:list:add") - @Log(title = "制工单子表列表", businessType = BusinessType.INSERT) - @PostMapping("/add") - @ResponseBody - public AjaxResult addSave(WorkorderList workorderList) - { - return toAjax(workorderListService.insertWorkorderList(workorderList)); - } - - /** - * 修改制工单子表列表 - */ - @GetMapping("/edit/{poId}") - public String edit(@PathVariable("poId") String poId, ModelMap mmap) - { - WorkorderList workorderList = workorderListService.selectWorkorderListById(poId); - mmap.put("workorderList", workorderList); - return prefix + "/edit"; - } - - /** - * 修改保存制工单子表列表 - */ - @RequiresPermissions("produce:list:edit") - @Log(title = "制工单子表列表", businessType = BusinessType.UPDATE) - @PostMapping("/edit") - @ResponseBody - public AjaxResult editSave(WorkorderList workorderList) - { - return toAjax(workorderListService.updateWorkorderList(workorderList)); - } - - /** - * 删除制工单子表列表 - */ - @RequiresPermissions("produce:list:remove") - @Log(title = "制工单子表列表", businessType = BusinessType.DELETE) - @PostMapping( "/remove") - @ResponseBody - public AjaxResult remove(String ids) - { - return toAjax(workorderListService.deleteWorkorderListByIds(ids)); - } - - @ResponseBody - @PostMapping("/getList") - public Result getList(WorkorderList workorderList)throws Exception{ - return Result.getSuccessResult(workorderListService.selectWorkorderListList(workorderList)); - } -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/produce/controller/WorkorderheadController.java b/ruoyi-admin/src/main/java/com/ruoyi/produce/controller/WorkorderheadController.java deleted file mode 100644 index afe80723..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/produce/controller/WorkorderheadController.java +++ /dev/null @@ -1,162 +0,0 @@ -package com.ruoyi.produce.controller; - -import com.alibaba.druid.util.StringUtils; -import com.alibaba.fastjson.JSONObject; -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.produce.domain.Workorderhead; -import com.ruoyi.produce.service.IWorkorderheadService; -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.Date; -import java.util.List; - -/** - * 制工Controller - * - * @author ruoyi - * @date 2021-11-09 - */ -@Controller -@RequestMapping("/produce/workorderhead") -public class WorkorderheadController extends BaseController { - private String prefix = "produce/workorderhead"; - - @Autowired - private IWorkorderheadService workorderheadService; - - @RequiresPermissions("produce:workorderhead:view") - @GetMapping() - public String workorderhead() { - return prefix + "/workorderhead"; - } - - /** - * 查询制工列表 - */ - @RequiresPermissions("produce:workorderhead:list") - @PostMapping("/list") - @ResponseBody - public TableDataInfo list(Workorderhead workorderhead) { - startPage(); - List list = workorderheadService.selectWorkorderheadList(workorderhead); - return getDataTable(list); - } - - /** - * 导出制工列表 - */ - @RequiresPermissions("produce:workorderhead:export") - @Log(title = "制工", businessType = BusinessType.EXPORT) - @PostMapping("/export") - @ResponseBody - public AjaxResult export(Workorderhead workorderhead) { - List list = workorderheadService.selectWorkorderheadList(workorderhead); - ExcelUtil util = new ExcelUtil(Workorderhead.class); - return util.exportExcel(list, "制工数据"); - } - - /** - * 新增制工 - */ - @GetMapping("/add") - public String add() { - return prefix + "/add"; - } - - /** - * 新增保存制工 - */ - @RequiresPermissions("produce:workorderhead:add") - @Log(title = "制工", businessType = BusinessType.INSERT) - @PostMapping("/add") - @ResponseBody - public Result addSave(String jsonStr) throws Exception { - JSONObject jsonObject = JSONObject.parseObject(jsonStr); - Workorderhead workorderhead = jsonObject.toJavaObject(Workorderhead.class); - if (StringUtils.isEmpty(workorderhead.getPoNo())) { - return Result.getFailResult("订单号不能为空！", null); - } - if (StringUtils.isEmpty(workorderhead.getPiNo())) { - return Result.getFailResult("line不能为空！", null); - } - Long cpQty = workorderhead.getCpQty(); - if (cpQty == null || cpQty <= 0) { - return Result.getFailResult("订单数量不能为空！", null); - } - Long ylCpQty = workorderhead.getYlCpQty(); - if (ylCpQty == null || ylCpQty <= 0) { - return Result.getFailResult("投单数量不能为空！", null); - } - Date sendDate = workorderhead.getSendDate(); - if (sendDate==null){ - return Result.getFailResult("交货日期不能为空！", null); - } - int i = workorderheadService.insertWorkorderhead(workorderhead); - return Result.getSuccessResult(i); - } - - /** - * 修改制工 - */ - @GetMapping("/edit/{poId}") - public String edit(@PathVariable("poId") String poId, ModelMap mmap) { - Workorderhead workorderhead = workorderheadService.selectWorkorderheadById(poId); - mmap.put("workorderhead", workorderhead); - return prefix + "/edit"; - } - - /** - * 修改保存制工 - */ - @RequiresPermissions("produce:workorderhead:edit") - @Log(title = "制工", businessType = BusinessType.UPDATE) - @PostMapping("/edit") - @ResponseBody - public Result editSave(String jsonStr) throws Exception { - JSONObject jsonObject = JSONObject.parseObject(jsonStr); - Workorderhead workorderhead = jsonObject.toJavaObject(Workorderhead.class); - if (StringUtils.isEmpty(workorderhead.getPoNo())) { - return Result.getFailResult("订单号不能为空！", null); - } - if (StringUtils.isEmpty(workorderhead.getPiNo())) { - return Result.getFailResult("line不能为空！", null); - } - Long cpQty = workorderhead.getCpQty(); - if (cpQty == null || cpQty <= 0) { - return Result.getFailResult("订单数量不能为空！", null); - } - Long ylCpQty = workorderhead.getYlCpQty(); - if (ylCpQty == null || ylCpQty <= 0) { - return Result.getFailResult("投单数量不能为空！", null); - } - int i = workorderheadService.updateWorkorderhead(workorderhead); - return Result.getSuccessResult(i); - } - - /** - * 删除制工 - */ - @RequiresPermissions("produce:workorderhead:remove") - @Log(title = "制工", businessType = BusinessType.DELETE) - @PostMapping("/remove") - @ResponseBody - public AjaxResult remove(String ids) { - return toAjax(workorderheadService.deleteWorkorderheadByIds(ids)); - } - - @PostMapping("/count") - @ResponseBody - public Result getPoId() throws Exception { - return workorderheadService.findCountByDay(); - } -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/produce/domain/WorkorderList.java b/ruoyi-admin/src/main/java/com/ruoyi/produce/domain/WorkorderList.java deleted file mode 100644 index c7db8b42..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/produce/domain/WorkorderList.java +++ /dev/null @@ -1,353 +0,0 @@ -package com.ruoyi.produce.domain; - -import com.alibaba.fastjson.annotation.JSONField; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - -import java.math.BigDecimal; - -/** - * 制工单子表列表对象 workorder_list - * - * @author ruoyi - * @date 2021-11-12 - */ -public class WorkorderList extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** */ - @Excel(name = "") - private String poId; - - /** */ - @Excel(name = "") - private String PNO; - - /** */ - @JSONField(name = "wlCode") - @Excel(name = "") - private String wlCode; - - /** */ - @JSONField(name = "itemname") - @Excel(name = "") - private String itemname; - - /** */ - @JSONField(name = "cpType") - @Excel(name = "") - private String itemstandard; - - /** */ - @JSONField(name = "cpDw") - @Excel(name = "") - private String stockDw; - - /** 计划数量 */ - @Excel(name = "") - private BigDecimal Qty; - - /** */ - @Excel(name = "") - private BigDecimal Weight; - - /** */ - @Excel(name = "") - private String MemoList; - - /** */ - @Excel(name = "实领数量") - private BigDecimal OrderQty; - - /** */ - @Excel(name = "") - private BigDecimal qQty; - - /** */ - @Excel(name = "") - private String wldm; - - /** */ - @Excel(name = "退回数量") - private BigDecimal returnQty; - - /** */ - @Excel(name = "") - private BigDecimal jaQty; - - /** */ - @Excel(name = "") - private String baseCode; - - /** */ - @Excel(name = "") - private BigDecimal fuWidth; - - /** */ - @Excel(name = "") - private String yflItemclass; - - /** */ - @Excel(name = "") - private String mouldNo; - - /** */ - @Excel(name = "") - private Long tiaoNum; - - /** */ - @Excel(name = "") - private String zpGuige; - - /** */ - @Excel(name = "") - private BigDecimal zpQty; - - /** */ - @Excel(name = "") - private BigDecimal llQty; - - /** */ - @Excel(name = "") - private BigDecimal qLlQty; - - public void setPoId(String poId) - { - this.poId = poId; - } - - public String getPoId() - { - return poId; - } - public void setPNO(String PNO) - { - this.PNO = PNO; - } - - public String getPNO() - { - return PNO; - } - public void setWlCode(String wlCode) - { - this.wlCode = wlCode; - } - - public String getWlCode() - { - return wlCode; - } - public void setItemname(String Itemname) - { - this.itemname = Itemname; - } - - public String getItemname() - { - return itemname; - } - public void setItemstandard(String Itemstandard) - { - this.itemstandard = Itemstandard; - } - - public String getItemstandard() - { - return itemstandard; - } - public void setStockDw(String stockDw) - { - this.stockDw = stockDw; - } - - public String getStockDw() - { - return stockDw; - } - public void setQty(BigDecimal Qty) - { - this.Qty = Qty; - } - - public BigDecimal getQty() - { - return Qty; - } - public void setWeight(BigDecimal Weight) - { - this.Weight = Weight; - } - - public BigDecimal getWeight() - { - return Weight; - } - public void setMemoList(String MemoList) - { - this.MemoList = MemoList; - } - - public String getMemoList() - { - return MemoList; - } - public void setOrderQty(BigDecimal OrderQty) - { - this.OrderQty = OrderQty; - } - - public BigDecimal getOrderQty() - { - return OrderQty; - } - public void setqQty(BigDecimal qQty) - { - this.qQty = qQty; - } - - public BigDecimal getqQty() - { - return qQty; - } - public void setWldm(String wldm) - { - this.wldm = wldm; - } - - public String getWldm() - { - return wldm; - } - public void setReturnQty(BigDecimal returnQty) - { - this.returnQty = returnQty; - } - - public BigDecimal getReturnQty() - { - return returnQty; - } - public void setJaQty(BigDecimal jaQty) - { - this.jaQty = jaQty; - } - - public BigDecimal getJaQty() - { - return jaQty; - } - public void setBaseCode(String baseCode) - { - this.baseCode = baseCode; - } - - public String getBaseCode() - { - return baseCode; - } - public void setFuWidth(BigDecimal fuWidth) - { - this.fuWidth = fuWidth; - } - - public BigDecimal getFuWidth() - { - return fuWidth; - } - public void setYflItemclass(String yflItemclass) - { - this.yflItemclass = yflItemclass; - } - - public String getYflItemclass() - { - return yflItemclass; - } - public void setMouldNo(String mouldNo) - { - this.mouldNo = mouldNo; - } - - public String getMouldNo() - { - return mouldNo; - } - public void setTiaoNum(Long tiaoNum) - { - this.tiaoNum = tiaoNum; - } - - public Long getTiaoNum() - { - return tiaoNum; - } - public void setZpGuige(String zpGuige) - { - this.zpGuige = zpGuige; - } - - public String getZpGuige() - { - return zpGuige; - } - public void setZpQty(BigDecimal zpQty) - { - this.zpQty = zpQty; - } - - public BigDecimal getZpQty() - { - return zpQty; - } - public void setLlQty(BigDecimal llQty) - { - this.llQty = llQty; - } - - public BigDecimal getLlQty() - { - return llQty; - } - public void setqLlQty(BigDecimal qLlQty) - { - this.qLlQty = qLlQty; - } - - public BigDecimal getqLlQty() - { - return qLlQty; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("poId", getPoId()) - .append("PNO", getPNO()) - .append("wlCode", getWlCode()) - .append("Itemname", getItemname()) - .append("Itemstandard", getItemstandard()) - .append("stockDw", getStockDw()) - .append("Qty", getQty()) - .append("Weight", getWeight()) - .append("MemoList", getMemoList()) - .append("OrderQty", getOrderQty()) - .append("qQty", getqQty()) - .append("wldm", getWldm()) - .append("returnQty", getReturnQty()) - .append("jaQty", getJaQty()) - .append("baseCode", getBaseCode()) - .append("fuWidth", getFuWidth()) - .append("yflItemclass", getYflItemclass()) - .append("mouldNo", getMouldNo()) - .append("tiaoNum", getTiaoNum()) - .append("zpGuige", getZpGuige()) - .append("zpQty", getZpQty()) - .append("llQty", getLlQty()) - .append("qLlQty", getqLlQty()) - .toString(); - } -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/produce/domain/Workorderhead.java b/ruoyi-admin/src/main/java/com/ruoyi/produce/domain/Workorderhead.java deleted file mode 100644 index 9199878e..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/produce/domain/Workorderhead.java +++ /dev/null @@ -1,634 +0,0 @@ -package com.ruoyi.produce.domain; - -import com.alibaba.fastjson.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; - -/** - * 制工对象 workorderhead - * - * @author ruoyi - * @date 2021-11-09 - */ -public class Workorderhead extends BaseEntity implements Cloneable{ - private static final long serialVersionUID = 1L; - - /** - * 工单号 - */ - @Excel(name = "工单号") - private String poId; - - /** - * 订单号 - */ - @Excel(name = "订单号") - private String poNo; - - /** - * 工单号 - */ - private String workNo; - - /** - * - */ - private String piNo; - - /** - * 客户代码 - */ - @Excel(name = "客户代码") - private String pCode; - - /** - * 公司名称 - */ - @Excel(name = "公司名称") - private String pName; - - /** - * 开工日期 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - @JSONField(format="yyyy-MM-dd") - @Excel(name = "开工日期", width = 30, dateFormat = "yyyy-MM-dd") - private Date beginDate; - - /** - * 完工日期 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - @JSONField(format="yyyy-MM-dd") - @Excel(name = "完工日期", width = 30, dateFormat = "yyyy-MM-dd") - private Date endDate; - - /** - * 开单日期 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - @JSONField(format="yyyy-MM-dd") - @Excel(name = "开单日期", width = 30, dateFormat = "yyyy-MM-dd") - private Date poDate; - - /** - * 发货日期 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - @JSONField(format="yyyy-MM-dd") - @Excel(name = "发货日期", width = 30, dateFormat = "yyyy-MM-dd") - private Date sendDate; - - /** - * 工单类型 - */ - @Excel(name = "工单类型") - private String workorderClass; - - /** - * 成品代码 - */ - @Excel(name = "成品代码") - private String cpCode; - - /** - * 成品名称 - */ - @Excel(name = "成品名称") - private String cpName; - - /** - * - */ - private String cpType; - - /** - * 规格型号 - */ - @Excel(name = "规格型号") - private String cpMachineno; - - /** - * 单位 - */ - @Excel(name = "单位") - private String cpDw; - - /** - * 数量 - */ - @Excel(name = "订单数量") - private Long cpQty; - - /** - * 投单数量 - */ - @Excel(name = "投单数量") - private Long ylCpQty; - - /** - * 完工入库数量 - */ - @Excel(name = "完工入库数量") - private Long cpInQty; - - /** - * 欠工单数量 - */ - @Excel(name = "欠工单数量") - private Long qdQty; - - /** - * 备注 - */ - @Excel(name = "备注") - private String bzMemo; - - /** - * 是否结案 - */ - @Excel(name = "是否结案") - private Integer endFlag; - - /** - * - */ - private Integer chinaInOrOut; - - /** - * - */ - private Integer isDelete; - - /** - * 成品料号 - */ - private String cpwldm; - - /** - * - */ - private Long nowcpstockqty; - - /** - * 内外销选择 - */ - private String NWX; - - /** - * - */ - private Integer haveprint; - - /** - * 版本号 - */ - private String bomVersionNo; - - /** - * - */ - private BigDecimal badQty; - - /** - * - */ - private String jaMan; - - /** - * - */ - private Date jaTime; - - /** - * - */ - @Excel(name = "") - private String department; - - /** - * - */ - private String cpWeizhi; - - /** - * - */ - private String mjWeizhi; - - /** - * 版本号 - */ - private String versionNo; - - /** - * - */ - private String Factory; - - /** - * 制造数量 - */ - private BigDecimal madeQty; - - /** - * 损耗 - */ - private BigDecimal qMadeQty; - - private List workorderLists; - - private String processName; - - public String getProcessName() { - return processName; - } - - public void setProcessName(String processName) { - this.processName = processName; - } - - public List getWorkorderLists() { - return workorderLists; - } - - public void setWorkorderLists(List workorderLists) { - this.workorderLists = workorderLists; - } - - public void setPoId(String poId) { - this.poId = poId; - } - - public String getPoId() { - return poId; - } - - public void setPoNo(String poNo) { - this.poNo = poNo; - } - - public String getPoNo() { - return poNo; - } - - public void setWorkNo(String workNo) { - this.workNo = workNo; - } - - public String getWorkNo() { - return workNo; - } - - public void setPiNo(String piNo) { - this.piNo = piNo; - } - - public String getPiNo() { - return piNo; - } - - public void setpCode(String pCode) { - this.pCode = pCode; - } - - public String getpCode() { - return pCode; - } - - public void setpName(String pName) { - this.pName = pName; - } - - public String getpName() { - return pName; - } - - public void setBeginDate(Date beginDate) { - this.beginDate = beginDate; - } - - public Date getBeginDate() { - return beginDate; - } - - public void setEndDate(Date endDate) { - this.endDate = endDate; - } - - public Date getEndDate() { - return endDate; - } - - public void setPoDate(Date poDate) { - this.poDate = poDate; - } - - public Date getPoDate() { - return poDate; - } - - public void setSendDate(Date sendDate) { - this.sendDate = sendDate; - } - - public Date getSendDate() { - return sendDate; - } - - public void setWorkorderClass(String workorderClass) { - this.workorderClass = workorderClass; - } - - public String getWorkorderClass() { - return workorderClass; - } - - public void setCpCode(String cpCode) { - this.cpCode = cpCode; - } - - public String getCpCode() { - return cpCode; - } - - public void setCpName(String cpName) { - this.cpName = cpName; - } - - public String getCpName() { - return cpName; - } - - public void setCpType(String cpType) { - this.cpType = cpType; - } - - public String getCpType() { - return cpType; - } - - public void setCpMachineno(String cpMachineno) { - this.cpMachineno = cpMachineno; - } - - public String getCpMachineno() { - return cpMachineno; - } - - public void setCpDw(String cpDw) { - this.cpDw = cpDw; - } - - public String getCpDw() { - return cpDw; - } - - public void setCpQty(Long cpQty) { - this.cpQty = cpQty; - } - - public Long getCpQty() { - return cpQty; - } - - public void setYlCpQty(Long ylCpQty) { - this.ylCpQty = ylCpQty; - } - - public Long getYlCpQty() { - return ylCpQty; - } - - public void setCpInQty(Long cpInQty) { - this.cpInQty = cpInQty; - } - - public Long getCpInQty() { - return cpInQty; - } - - public void setQdQty(Long qdQty) { - this.qdQty = qdQty; - } - - public Long getQdQty() { - return qdQty; - } - - public void setBzMemo(String bzMemo) { - this.bzMemo = bzMemo; - } - - public String getBzMemo() { - return bzMemo; - } - - public void setEndFlag(Integer endFlag) { - this.endFlag = endFlag; - } - - public Integer getEndFlag() { - return endFlag; - } - - public void setChinaInOrOut(Integer chinaInOrOut) { - this.chinaInOrOut = chinaInOrOut; - } - - public Integer getChinaInOrOut() { - return chinaInOrOut; - } - - public void setIsDelete(Integer isDelete) { - this.isDelete = isDelete; - } - - public Integer getIsDelete() { - return isDelete; - } - - public void setCpwldm(String cpwldm) { - this.cpwldm = cpwldm; - } - - public String getCpwldm() { - return cpwldm; - } - - public void setNowcpstockqty(Long nowcpstockqty) { - this.nowcpstockqty = nowcpstockqty; - } - - public Long getNowcpstockqty() { - return nowcpstockqty; - } - - public void setNWX(String NWX) { - this.NWX = NWX; - } - - public String getNWX() { - return NWX; - } - - public void setHaveprint(Integer haveprint) { - this.haveprint = haveprint; - } - - public Integer getHaveprint() { - return haveprint; - } - - public void setBomVersionNo(String bomVersionNo) { - this.bomVersionNo = bomVersionNo; - } - - public String getBomVersionNo() { - return bomVersionNo; - } - - public void setBadQty(BigDecimal badQty) { - this.badQty = badQty; - } - - public BigDecimal getBadQty() { - return badQty; - } - - public void setJaMan(String jaMan) { - this.jaMan = jaMan; - } - - public String getJaMan() { - return jaMan; - } - - public void setJaTime(Date jaTime) { - this.jaTime = jaTime; - } - - public Date getJaTime() { - return jaTime; - } - - public void setDepartment(String department) { - this.department = department; - } - - public String getDepartment() { - return department; - } - - public void setCpWeizhi(String cpWeizhi) { - this.cpWeizhi = cpWeizhi; - } - - public String getCpWeizhi() { - return cpWeizhi; - } - - public void setMjWeizhi(String mjWeizhi) { - this.mjWeizhi = mjWeizhi; - } - - public String getMjWeizhi() { - return mjWeizhi; - } - - public void setVersionNo(String versionNo) { - this.versionNo = versionNo; - } - - public String getVersionNo() { - return versionNo; - } - - public void setFactory(String Factory) { - this.Factory = Factory; - } - - public String getFactory() { - return Factory; - } - - public void setMadeQty(BigDecimal madeQty) { - this.madeQty = madeQty; - } - - public BigDecimal getMadeQty() { - return madeQty; - } - - public void setqMadeQty(BigDecimal qMadeQty) { - this.qMadeQty = qMadeQty; - } - - public BigDecimal getqMadeQty() { - return qMadeQty; - } - - @Override - public String toString() { - return "Workorderhead{" + - "poId='" + poId + '\'' + - ", poNo='" + poNo + '\'' + - ", workNo='" + workNo + '\'' + - ", piNo='" + piNo + '\'' + - ", pCode='" + pCode + '\'' + - ", pName='" + pName + '\'' + - ", beginDate=" + beginDate + - ", endDate=" + endDate + - ", poDate=" + poDate + - ", sendDate=" + sendDate + - ", workorderClass='" + workorderClass + '\'' + - ", cpCode='" + cpCode + '\'' + - ", cpName='" + cpName + '\'' + - ", cpType='" + cpType + '\'' + - ", cpMachineno='" + cpMachineno + '\'' + - ", cpDw='" + cpDw + '\'' + - ", cpQty=" + cpQty + - ", ylCpQty=" + ylCpQty + - ", cpInQty=" + cpInQty + - ", qdQty=" + qdQty + - ", bzMemo='" + bzMemo + '\'' + - ", endFlag=" + endFlag + - ", chinaInOrOut=" + chinaInOrOut + - ", isDelete=" + isDelete + - ", cpwldm='" + cpwldm + '\'' + - ", nowcpstockqty=" + nowcpstockqty + - ", NWX='" + NWX + '\'' + - ", haveprint=" + haveprint + - ", bomVersionNo='" + bomVersionNo + '\'' + - ", badQty=" + badQty + - ", jaMan='" + jaMan + '\'' + - ", jaTime=" + jaTime + - ", department='" + department + '\'' + - ", cpWeizhi='" + cpWeizhi + '\'' + - ", mjWeizhi='" + mjWeizhi + '\'' + - ", versionNo='" + versionNo + '\'' + - ", Factory='" + Factory + '\'' + - ", madeQty=" + madeQty + - ", qMadeQty=" + qMadeQty + - ", workorderLists=" + workorderLists + - ", processName='" + processName + '\'' + - '}'; - } - - @Override - public Workorderhead clone() { - Workorderhead workorderhead = new Workorderhead(); - try { - workorderhead = (Workorderhead) super.clone(); - } catch (Exception e) { - e.printStackTrace(); - } - return workorderhead; - } - -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/produce/mapper/WorkorderListMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/produce/mapper/WorkorderListMapper.java deleted file mode 100644 index cde68616..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/produce/mapper/WorkorderListMapper.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.ruoyi.produce.mapper; - -import com.ruoyi.produce.domain.WorkorderList; - -import java.util.List; - -/** - * 制工单子表列表Mapper接口 - * - * @author ruoyi - * @date 2021-11-12 - */ -public interface WorkorderListMapper -{ - /** - * 查询制工单子表列表 - * - * @param poId 制工单子表列表ID - * @return 制工单子表列表 - */ - public WorkorderList selectWorkorderListById(String poId); - - /** - * 查询制工单子表列表列表 - * - * @param workorderList 制工单子表列表 - * @return 制工单子表列表集合 - */ - public List selectWorkorderListList(WorkorderList workorderList); - - /** - * 新增制工单子表列表 - * - * @param workorderList 制工单子表列表 - * @return 结果 - */ - public int insertWorkorderList(WorkorderList workorderList); - - /** - * 修改制工单子表列表 - * - * @param workorderList 制工单子表列表 - * @return 结果 - */ - public int updateWorkorderList(WorkorderList workorderList); - - /** - * 删除制工单子表列表 - * - * @param poId 制工单子表列表ID - * @return 结果 - */ - public int deleteWorkorderListById(String poId); - - /** - * 批量删除制工单子表列表 - * - * @param poIds 需要删除的数据ID - * @return 结果 - */ - public int deleteWorkorderListByIds(String[] poIds); -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/produce/mapper/WorkorderheadMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/produce/mapper/WorkorderheadMapper.java deleted file mode 100644 index 4fb6649e..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/produce/mapper/WorkorderheadMapper.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.ruoyi.produce.mapper; - -import com.ruoyi.produce.domain.Workorderhead; - -import java.util.List; - -/** - * 制工Mapper接口 - * - * @author ruoyi - * @date 2021-11-09 - */ -public interface WorkorderheadMapper -{ - /** - * 查询制工 - * - * @param poId 制工ID - * @return 制工 - */ - public Workorderhead selectWorkorderheadById(String poId); - - /** - * 查询制工列表 - * - * @param workorderhead 制工 - * @return 制工集合 - */ - public List selectWorkorderheadList(Workorderhead workorderhead); - - /** - * 新增制工 - * - * @param workorderhead 制工 - * @return 结果 - */ - public int insertWorkorderhead(Workorderhead workorderhead); - - /** - * 修改制工 - * - * @param workorderhead 制工 - * @return 结果 - */ - public int updateWorkorderhead(Workorderhead workorderhead); - - /** - * 删除制工 - * - * @param poId 制工ID - * @return 结果 - */ - public int deleteWorkorderheadById(String poId); - - /** - * 批量删除制工 - * - * @param poIds 需要删除的数据ID - * @return 结果 - */ - public int deleteWorkorderheadByIds(String[] poIds); - - public Integer selectCountByDay(); - -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/produce/service/IWorkorderListService.java b/ruoyi-admin/src/main/java/com/ruoyi/produce/service/IWorkorderListService.java deleted file mode 100644 index 3cdf3c46..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/produce/service/IWorkorderListService.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.ruoyi.produce.service; - -import com.ruoyi.produce.domain.WorkorderList; - -import java.util.List; - -/** - * 制工单子表列表Service接口 - * - * @author ruoyi - * @date 2021-11-12 - */ -public interface IWorkorderListService -{ - /** - * 查询制工单子表列表 - * - * @param poId 制工单子表列表ID - * @return 制工单子表列表 - */ - public WorkorderList selectWorkorderListById(String poId); - - /** - * 查询制工单子表列表列表 - * - * @param workorderList 制工单子表列表 - * @return 制工单子表列表集合 - */ - public List selectWorkorderListList(WorkorderList workorderList); - - /** - * 新增制工单子表列表 - * - * @param workorderList 制工单子表列表 - * @return 结果 - */ - public int insertWorkorderList(WorkorderList workorderList); - - /** - * 修改制工单子表列表 - * - * @param workorderList 制工单子表列表 - * @return 结果 - */ - public int updateWorkorderList(WorkorderList workorderList); - - /** - * 批量删除制工单子表列表 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - public int deleteWorkorderListByIds(String ids); - - /** - * 删除制工单子表列表信息 - * - * @param poId 制工单子表列表ID - * @return 结果 - */ - public int deleteWorkorderListById(String poId); -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/produce/service/IWorkorderheadService.java b/ruoyi-admin/src/main/java/com/ruoyi/produce/service/IWorkorderheadService.java deleted file mode 100644 index daf1375e..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/produce/service/IWorkorderheadService.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.ruoyi.produce.service; - -import com.ruoyi.ck.utils.Result; -import com.ruoyi.produce.domain.Workorderhead; - -import java.util.List; - -/** - * 制工Service接口 - * - * @author ruoyi - * @date 2021-11-09 - */ -public interface IWorkorderheadService -{ - /** - * 查询制工 - * - * @param poId 制工ID - * @return 制工 - */ - public Workorderhead selectWorkorderheadById(String poId); - - /** - * 查询制工列表 - * - * @param workorderhead 制工 - * @return 制工集合 - */ - public List selectWorkorderheadList(Workorderhead workorderhead); - - /** - * 新增制工 - * - * @param workorderhead 制工 - * @return 结果 - */ - public int insertWorkorderhead(Workorderhead workorderhead)throws Exception; - - /** - * 修改制工 - * - * @param workorderhead 制工 - * @return 结果 - */ - public int updateWorkorderhead(Workorderhead workorderhead)throws Exception; - - /** - * 批量删除制工 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - public int deleteWorkorderheadByIds(String ids); - - /** - * 删除制工信息 - * - * @param poId 制工ID - * @return 结果 - */ - public int deleteWorkorderheadById(String poId); - - public Result findCountByDay()throws Exception; -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/produce/service/impl/WorkorderListServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/produce/service/impl/WorkorderListServiceImpl.java deleted file mode 100644 index f39631cd..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/produce/service/impl/WorkorderListServiceImpl.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.ruoyi.produce.service.impl; - -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.produce.domain.WorkorderList; -import com.ruoyi.produce.mapper.WorkorderListMapper; -import com.ruoyi.produce.service.IWorkorderListService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 制工单子表列表Service业务层处理 - * - * @author ruoyi - * @date 2021-11-12 - */ -@Service -public class WorkorderListServiceImpl implements IWorkorderListService -{ - @Autowired - private WorkorderListMapper workorderListMapper; - - /** - * 查询制工单子表列表 - * - * @param poId 制工单子表列表ID - * @return 制工单子表列表 - */ - @Override - public WorkorderList selectWorkorderListById(String poId) - { - return workorderListMapper.selectWorkorderListById(poId); - } - - /** - * 查询制工单子表列表列表 - * - * @param workorderList 制工单子表列表 - * @return 制工单子表列表 - */ - @Override - public List selectWorkorderListList(WorkorderList workorderList) - { - return workorderListMapper.selectWorkorderListList(workorderList); - } - - /** - * 新增制工单子表列表 - * - * @param workorderList 制工单子表列表 - * @return 结果 - */ - @Override - public int insertWorkorderList(WorkorderList workorderList) - { - return workorderListMapper.insertWorkorderList(workorderList); - } - - /** - * 修改制工单子表列表 - * - * @param workorderList 制工单子表列表 - * @return 结果 - */ - @Override - public int updateWorkorderList(WorkorderList workorderList) - { - return workorderListMapper.updateWorkorderList(workorderList); - } - - /** - * 删除制工单子表列表对象 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - @Override - public int deleteWorkorderListByIds(String ids) - { - return workorderListMapper.deleteWorkorderListByIds(Convert.toStrArray(ids)); - } - - /** - * 删除制工单子表列表信息 - * - * @param poId 制工单子表列表ID - * @return 结果 - */ - @Override - public int deleteWorkorderListById(String poId) - { - return workorderListMapper.deleteWorkorderListById(poId); - } -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/produce/service/impl/WorkorderheadServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/produce/service/impl/WorkorderheadServiceImpl.java deleted file mode 100644 index e0e1db02..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/produce/service/impl/WorkorderheadServiceImpl.java +++ /dev/null @@ -1,199 +0,0 @@ -package com.ruoyi.produce.service.impl; - -import com.ruoyi.ck.domain.Bom; -import com.ruoyi.ck.domain.Provider; -import com.ruoyi.ck.mapper.BomMapper; -import com.ruoyi.ck.mapper.ProviderMapper; -import com.ruoyi.ck.utils.Result; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.produce.domain.WorkorderList; -import com.ruoyi.produce.domain.Workorderhead; -import com.ruoyi.produce.mapper.WorkorderListMapper; -import com.ruoyi.produce.mapper.WorkorderheadMapper; -import com.ruoyi.produce.service.IWorkorderheadService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.time.LocalDate; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -/** - * 制工Service业务层处理 - * - * @author ruoyi - * @date 2021-11-09 - */ -@Service -public class WorkorderheadServiceImpl implements IWorkorderheadService { - @Autowired - private WorkorderheadMapper workorderheadMapper; - - @Autowired - private WorkorderListMapper workorderListMapper; - - @Autowired - private ProviderMapper providerMapper; - - @Autowired - private BomMapper bomMapper; - - /** - * 查询制工 - * - * @param poId 制工ID - * @return 制工 - */ - @Override - public Workorderhead selectWorkorderheadById(String poId) { - return workorderheadMapper.selectWorkorderheadById(poId); - } - - /** - * 查询制工列表 - * - * @param workorderhead 制工 - * @return 制工 - */ - @Override - public List selectWorkorderheadList(Workorderhead workorderhead) { - return workorderheadMapper.selectWorkorderheadList(workorderhead); - } - - /** - * 新增制工 - * - * @param workorderhead 制工 - * @return 结果 - */ - @Override - public int insertWorkorderhead(Workorderhead workorderhead) throws Exception { - if (workorderhead.getEndFlag() == null) { - workorderhead.setEndFlag(0); - } - String workNo = workorderhead.getWorkNo(); - workorderhead.setPoId(workNo); - Provider provider = new Provider(); - provider.setpName(workorderhead.getpName()); - List providers = providerMapper.selectByItem(provider); - workorderhead.setpCode(providers.get(0).getpCode()); - workorderhead.setWorkorderClass("生产工单"); - workorderhead.setYlCpQty(workorderhead.getCpQty()); - List workorderLists = workorderhead.getWorkorderLists(); - workorderheadMapper.insertWorkorderhead(workorderhead); - addWorkOrderList(workorderLists, workorderhead); - return 1; - } - - /** - * 修改制工 - * - * @param workorderhead 制工 - * @return 结果 - */ - @Override - public int updateWorkorderhead(Workorderhead workorderhead)throws Exception { - String poId = workorderhead.getWorkNo(); - Workorderhead tempWorkOrderHead = new Workorderhead(); - tempWorkOrderHead.setPoNo(workorderhead.getPoNo()); - List workorderheads = workorderheadMapper.selectWorkorderheadList(tempWorkOrderHead); - for (Workorderhead each : workorderheads) { - workorderListMapper.deleteWorkorderListById(each.getWorkNo()); - } - //workorderListMapper.deleteWorkorderListById(poId); - Provider provider = new Provider(); - provider.setpName(workorderhead.getpName()); - List providers = providerMapper.selectByItem(provider); - workorderhead.setPoDate(new Date()); - workorderhead.setpCode(providers.get(0).getpCode()); - List workorderLists = workorderhead.getWorkorderLists(); - workorderheadMapper.updateWorkorderhead(workorderhead); - addWorkOrderList(workorderLists,workorderhead); - return 1; - } - - /** - * 删除制工对象 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - @Override - public int deleteWorkorderheadByIds(String ids) { - return workorderheadMapper.deleteWorkorderheadByIds(Convert.toStrArray(ids)); - } - - /** - * 删除制工信息 - * - * @param poId 制工ID - * @return 结果 - */ - @Override - public int deleteWorkorderheadById(String poId) { - return workorderheadMapper.deleteWorkorderheadById(poId); - } - - @Override - public Result findCountByDay() throws Exception { - int count = workorderheadMapper.selectCountByDay() + 1; - LocalDate now = LocalDate.now(); - String s = now.toString().replaceAll("-", ""); - String poId = "WO" + s; - if (count >= 100) { - poId += count; - } else if (count >= 10) { - poId += "0" + count; - } else { - poId += "00" + count; - } - return Result.getSuccessResult(poId); - } - - //循环添加制工单子表 - private void addWorkOrderList(List workorderLists, Workorderhead workorderhead) throws Exception { - Bom tempBom = new Bom(); - Bom tempBom2 = new Bom(); - List tempWorkOrderList = new ArrayList<>(); - int tempNo = 1; - tempBom.setCpCode(workorderhead.getCpCode()); - List boms = bomMapper.selectBomList(tempBom); - for (WorkorderList workorderList : workorderLists) { - for (Bom bom : boms) { - if (bom.getWlCode().equals(workorderList.getWlCode())) { - workorderList.setPoId(workorderhead.getWorkNo()); - workorderList.setPNO("" + tempNo); - workorderListMapper.insertWorkorderList(workorderList); - tempNo++; - break; - } - } - tempBom2.setCpCode(workorderList.getWlCode()); - List bomss = bomMapper.selectBomList(tempBom2); - if (bomss != null && bomss.size() > 0) { - Workorderhead newWorkorderhead = workorderhead.clone(); - newWorkorderhead.setCpCode(workorderList.getWlCode()); - newWorkorderhead.setCpName(workorderList.getItemname()); - newWorkorderhead.setCpType(workorderList.getItemstandard()); - newWorkorderhead.setCpDw(workorderList.getStockDw()); - String data = (String) findCountByDay().getData(); - newWorkorderhead.setPoId(data); - newWorkorderhead.setWorkNo(data); - workorderheadMapper.insertWorkorderhead(newWorkorderhead); - for (Bom eachBom : bomss) { - WorkorderList wol = new WorkorderList(); - wol.setWlCode(eachBom.getWlCode()); - wol.setItemname(eachBom.getItemname()); - wol.setItemstandard(eachBom.getItemstandard()); - wol.setStockDw(eachBom.getStockDw()); - wol.setZpGuige(eachBom.getZpGuige()); - wol.setMemoList(eachBom.getMemolist()); - tempWorkOrderList.add(wol); - } - addWorkOrderList(tempWorkOrderList, newWorkorderhead); - } - } - } - -} diff --git a/ruoyi-admin/src/main/resources/mapper/produce/WorkorderListMapper.xml b/ruoyi-admin/src/main/resources/mapper/produce/WorkorderListMapper.xml deleted file mode 100644 index 9bf433c8..00000000 --- a/ruoyi-admin/src/main/resources/mapper/produce/WorkorderListMapper.xml +++ /dev/null @@ -1,165 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select PO_ID, PNO, Wl_Code, Itemname, Itemstandard, Stock_dw, Qty, Weight, MemoList, OrderQty, Q_Qty, wldm, Return_Qty, JA_Qty, base_code, fu_width, YFL_ItemClass, Mould_No, tiao_num, zp_guige, zp_qty, LL_Qty, Q_LL_Qty from workorder_list - - - - - - - - insert into workorder_list - - PO_ID, - PNO, - Wl_Code, - Itemname, - Itemstandard, - Stock_dw, - Qty, - Weight, - MemoList, - OrderQty, - Q_Qty, - wldm, - Return_Qty, - JA_Qty, - base_code, - fu_width, - YFL_ItemClass, - Mould_No, - tiao_num, - zp_guige, - zp_qty, - LL_Qty, - Q_LL_Qty, - - - #{poId}, - #{PNO}, - #{wlCode}, - #{itemname}, - #{itemstandard}, - #{stockDw}, - #{Qty}, - #{Weight}, - #{MemoList}, - #{OrderQty}, - #{qQty}, - #{wldm}, - #{returnQty}, - #{jaQty}, - #{baseCode}, - #{fuWidth}, - #{yflItemclass}, - #{mouldNo}, - #{tiaoNum}, - #{zpGuige}, - #{zpQty}, - #{llQty}, - #{qLlQty}, - - - - - update workorder_list - - PNO = #{PNO}, - Wl_Code = #{wlCode}, - Itemname = #{itemname}, - Itemstandard = #{itemstandard}, - Stock_dw = #{stockDw}, - Qty = #{Qty}, - Weight = #{Weight}, - MemoList = #{MemoList}, - OrderQty = #{OrderQty}, - Q_Qty = #{qQty}, - wldm = #{wldm}, - Return_Qty = #{returnQty}, - JA_Qty = #{jaQty}, - base_code = #{baseCode}, - fu_width = #{fuWidth}, - YFL_ItemClass = #{yflItemclass}, - Mould_No = #{mouldNo}, - tiao_num = #{tiaoNum}, - zp_guige = #{zpGuige}, - zp_qty = #{zpQty}, - LL_Qty = #{llQty}, - Q_LL_Qty = #{qLlQty}, - - where PO_ID = #{poId} - - - - delete from workorder_list where PO_ID = #{poId} - - - - delete from workorder_list where PO_ID in - - #{poId} - - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/produce/WorkorderheadMapper.xml b/ruoyi-admin/src/main/resources/mapper/produce/WorkorderheadMapper.xml deleted file mode 100644 index 66a9c294..00000000 --- a/ruoyi-admin/src/main/resources/mapper/produce/WorkorderheadMapper.xml +++ /dev/null @@ -1,227 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select PO_ID, PO_NO, Work_NO, PI_NO, P_CODE, P_Name, Begin_date, End_date, PO_date, Send_date, workorder_Class, CP_CODE, CP_NAME, CP_TYPE, CP_MachineNO, CP_DW, CP_QTY, YL_CP_QTY, CP_IN_QTY, QD_QTY, BZ_memo, End_flag, China_in_or_out, Is_delete, cpwldm, nowcpstockqty, NWX, haveprint, BOM_Version_NO, BAD_QTY, ja_man, ja_time, department, CP_Weizhi, MJ_Weizhi, Version_NO, Factory, Made_Qty, Q_Made_Qty from workorderhead - - - - - - - - insert into workorderhead - - PO_ID, - PO_NO, - Work_NO, - PI_NO, - P_CODE, - P_Name, - Begin_date, - End_date, - PO_date, - Send_date, - workorder_Class, - CP_CODE, - CP_NAME, - CP_TYPE, - CP_MachineNO, - CP_DW, - CP_QTY, - YL_CP_QTY, - CP_IN_QTY, - QD_QTY, - BZ_memo, - End_flag, - China_in_or_out, - Is_delete, - cpwldm, - nowcpstockqty, - NWX, - haveprint, - BOM_Version_NO, - BAD_QTY, - ja_man, - ja_time, - department, - CP_Weizhi, - MJ_Weizhi, - Version_NO, - Factory, - Made_Qty, - Q_Made_Qty, - - - #{poId}, - #{poNo}, - #{workNo}, - #{piNo}, - #{pCode}, - #{pName}, - #{beginDate}, - #{endDate}, - #{poDate}, - #{sendDate}, - #{workorderClass}, - #{cpCode}, - #{cpName}, - #{cpType}, - #{cpMachineno}, - #{cpDw}, - #{cpQty}, - #{ylCpQty}, - #{cpInQty}, - #{qdQty}, - #{bzMemo}, - #{endFlag}, - #{chinaInOrOut}, - #{isDelete}, - #{cpwldm}, - #{nowcpstockqty}, - #{NWX}, - #{haveprint}, - #{bomVersionNo}, - #{badQty}, - #{jaMan}, - #{jaTime}, - #{department}, - #{cpWeizhi}, - #{mjWeizhi}, - #{versionNo}, - #{Factory}, - #{madeQty}, - #{qMadeQty}, - - - - - update workorderhead - - PO_NO = #{poNo}, - Work_NO = #{workNo}, - PI_NO = #{piNo}, - P_CODE = #{pCode}, - P_Name = #{pName}, - Begin_date = #{beginDate}, - End_date = #{endDate}, - PO_date = #{poDate}, - Send_date = #{sendDate}, - workorder_Class = #{workorderClass}, - CP_CODE = #{cpCode}, - CP_NAME = #{cpName}, - CP_TYPE = #{cpType}, - CP_MachineNO = #{cpMachineno}, - CP_DW = #{cpDw}, - CP_QTY = #{cpQty}, - YL_CP_QTY = #{ylCpQty}, - CP_IN_QTY = #{cpInQty}, - QD_QTY = #{qdQty}, - BZ_memo = #{bzMemo}, - End_flag = #{endFlag}, - China_in_or_out = #{chinaInOrOut}, - Is_delete = #{isDelete}, - cpwldm = #{cpwldm}, - nowcpstockqty = #{nowcpstockqty}, - NWX = #{NWX}, - haveprint = #{haveprint}, - BOM_Version_NO = #{bomVersionNo}, - BAD_QTY = #{badQty}, - ja_man = #{jaMan}, - ja_time = #{jaTime}, - department = #{department}, - CP_Weizhi = #{cpWeizhi}, - MJ_Weizhi = #{mjWeizhi}, - Version_NO = #{versionNo}, - Factory = #{Factory}, - Made_Qty = #{madeQty}, - Q_Made_Qty = #{qMadeQty}, - - where PO_ID = #{poId} - - - - delete from workorderhead where PO_ID = #{poId} - - - - delete from workorderhead where PO_ID in - - #{poId} - - - - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/produce/list/add.html b/ruoyi-admin/src/main/resources/templates/produce/list/add.html deleted file mode 100644 index 5f5199f2..00000000 --- a/ruoyi-admin/src/main/resources/templates/produce/list/add.html +++ /dev/null @@ -1,163 +0,0 @@ - - - - - - -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
- - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/produce/list/edit.html b/ruoyi-admin/src/main/resources/templates/produce/list/edit.html deleted file mode 100644 index 01ec0c59..00000000 --- a/ruoyi-admin/src/main/resources/templates/produce/list/edit.html +++ /dev/null @@ -1,164 +0,0 @@ - - - - - - -
-
- -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
- - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/produce/list/list.html b/ruoyi-admin/src/main/resources/templates/produce/list/list.html deleted file mode 100644 index 0aca8bb5..00000000 --- a/ruoyi-admin/src/main/resources/templates/produce/list/list.html +++ /dev/null @@ -1,253 +0,0 @@ - - - - - - -
-
-
-
-
-
    -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • -  搜索 -  重置 -
    • -
-
-
-
- - -
-
-
-
-
- - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/produce/workorderhead/add.html b/ruoyi-admin/src/main/resources/templates/produce/workorderhead/add.html deleted file mode 100644 index 84f9d27d..00000000 --- a/ruoyi-admin/src/main/resources/templates/produce/workorderhead/add.html +++ /dev/null @@ -1,1001 +0,0 @@ - - - - - - - - - - - - -
-
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
-
- - -
-
-
-
- -
-
- - -
-
-
-
- -
- -
-
-
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
-
- - -
-
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
-
- - -
-
-
-
- -
- -
-
-
-
- -
- - - - -
-
-
-
-
- -
-
-
- - - - - - -
- -
- -
- - - - -
- -
- - - - - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/produce/workorderhead/edit.html b/ruoyi-admin/src/main/resources/templates/produce/workorderhead/edit.html deleted file mode 100644 index 75f03e88..00000000 --- a/ruoyi-admin/src/main/resources/templates/produce/workorderhead/edit.html +++ /dev/null @@ -1,916 +0,0 @@ - - - - - - - - - -
-
- -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
-
- - -
-
-
-
- -
-
- - -
-
-
-
- -
-
- - -
-
-
-
- -
-
- - -
-
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
-
- - - - -
-
-
-
-
- -
-
-
-
- - - - - - - - - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/produce/workorderhead/workorderhead.html b/ruoyi-admin/src/main/resources/templates/produce/workorderhead/workorderhead.html deleted file mode 100644 index 54fa2fce..00000000 --- a/ruoyi-admin/src/main/resources/templates/produce/workorderhead/workorderhead.html +++ /dev/null @@ -1,440 +0,0 @@ - - - - - - -
-
-
-
-
-
    -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - - - - -
    • -
  • - - - - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • -  搜索 -  重置 -
    • -
-
-
-
- - -
-
-
-
-
- - - - \ No newline at end of file