From 6cb151780fd3fe7b100c44eb3eef5d53944a48d0 Mon Sep 17 00:00:00 2001 From: zhangsiqi <2825463979@qq.com> Date: Mon, 18 Dec 2023 18:42:10 +0800 Subject: [PATCH] =?UTF-8?q?[add]=20=E6=B7=BB=E5=8A=A0=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=95=E9=A1=B5=E9=9D=A2,=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E4=BA=A7=E5=93=81=E5=9E=8B=E5=8F=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=BC=80=E5=8F=91=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=8D=95=E9=A2=86=E6=96=99=E5=88=97=E8=A1=A8=EF=BC=8C=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E7=94=9F=E4=BA=A7=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/controller/ErpBomController.java | 50 +++ .../com/ruoyi/erp/mapper/ErpBomMapper.java | 3 + .../ruoyi/erp/mapper/ErpMaterialMapper.java | 3 +- .../com/ruoyi/erp/service/IErpBomService.java | 4 + .../erp/service/IErpMaterialService.java | 2 +- .../erp/service/impl/ErpBomServiceImpl.java | 22 +- .../service/impl/ErpMaterialServiceImpl.java | 4 +- .../controller/SysMakeOrderController.java | 148 +++++++ .../controller/SysPickingController.java | 148 +++++++ .../controller/SysProductModelController.java | 148 +++++++ .../com/ruoyi/system/domain/SysMakeOrder.java | 279 +++++++++++++ .../com/ruoyi/system/domain/SysPicking.java | 153 +++++++ .../ruoyi/system/domain/SysProductModel.java | 139 +++++++ .../system/mapper/SysMakeOrderMapper.java | 78 ++++ .../ruoyi/system/mapper/SysPickingMapper.java | 78 ++++ .../system/mapper/SysProductModelMapper.java | 78 ++++ .../system/service/ISysMakeOrderService.java | 76 ++++ .../system/service/ISysPickingService.java | 76 ++++ .../service/ISysProductModelService.java | 76 ++++ .../service/impl/SysMakeOrderServiceImpl.java | 127 ++++++ .../service/impl/SysPickingServiceImpl.java | 127 ++++++ .../impl/SysProductModelServiceImpl.java | 125 ++++++ .../resources/mapper/erp/ErpBomMapper.xml | 12 +- .../mapper/erp/ErpMaterialMapper.xml | 10 +- .../mapper/system/SysMakeOrderMapper.xml | 159 ++++++++ .../mapper/system/SysPickingMapper.xml | 120 ++++++ .../mapper/system/SysProductModelMapper.xml | 114 ++++++ .../css/bootstrap-table-fixed-columns.css | 4 +- .../js/bootstrap-table-fixed-columns.js | 377 ++++++++++++------ .../main/resources/static/ruoyi/js/ry-ui.js | 6 +- .../main/resources/templates/erp/bom/add.html | 55 ++- .../main/resources/templates/erp/bom/bom.html | 363 +++++++++++++++-- .../resources/templates/erp/bom/edit.html | 32 +- .../resources/templates/erp/bom/equals.html | 143 +++++++ .../src/main/resources/templates/include.html | 13 +- .../templates/system/customerQuote/add.html | 52 ++- .../system/developReviseOrder/add.html | 7 +- .../templates/system/makeorder/add.html | 141 +++++++ .../templates/system/makeorder/edit.html | 136 +++++++ .../templates/system/makeorder/makeorder.html | 229 +++++++++++ .../resources/templates/system/model/add.html | 73 ++++ .../templates/system/model/edit.html | 74 ++++ .../templates/system/model/model.html | 161 ++++++++ .../templates/system/picking/add.html | 79 ++++ .../templates/system/picking/edit.html | 68 ++++ .../templates/system/picking/picking.html | 161 ++++++++ 46 files changed, 4306 insertions(+), 227 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysMakeOrderController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysPickingController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysProductModelController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysMakeOrder.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysPicking.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysProductModel.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysMakeOrderMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysPickingMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysProductModelMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysMakeOrderService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysPickingService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysProductModelService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeOrderServiceImpl.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysPickingServiceImpl.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysProductModelServiceImpl.java create mode 100644 ruoyi-admin/src/main/resources/mapper/system/SysMakeOrderMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/system/SysPickingMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/system/SysProductModelMapper.xml create mode 100644 ruoyi-admin/src/main/resources/templates/erp/bom/equals.html create mode 100644 ruoyi-admin/src/main/resources/templates/system/makeorder/add.html create mode 100644 ruoyi-admin/src/main/resources/templates/system/makeorder/edit.html create mode 100644 ruoyi-admin/src/main/resources/templates/system/makeorder/makeorder.html create mode 100644 ruoyi-admin/src/main/resources/templates/system/model/add.html create mode 100644 ruoyi-admin/src/main/resources/templates/system/model/edit.html create mode 100644 ruoyi-admin/src/main/resources/templates/system/model/model.html create mode 100644 ruoyi-admin/src/main/resources/templates/system/picking/add.html create mode 100644 ruoyi-admin/src/main/resources/templates/system/picking/edit.html create mode 100644 ruoyi-admin/src/main/resources/templates/system/picking/picking.html diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpBomController.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpBomController.java index 110443ca..bfbeefac 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpBomController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpBomController.java @@ -14,6 +14,7 @@ import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.*; +import java.util.ArrayList; import java.util.List; /** @@ -169,4 +170,53 @@ public class ErpBomController extends BaseController return "审核成功"; } } + @RequiresPermissions("erp:bom:equals") + @GetMapping( "/equals") + public String bomEqulas() + { + return prefix + "/equals"; + } + + @RequiresPermissions("erp:bom:equals") + @GetMapping("/euqalsBom") + public ModelMap equalsBom(@RequestBody String bomNo1,String bomNo2){ + ModelMap map = new ModelMap(); + System.out.println("bomNo1：" + bomNo1+ " bomNo2：" +bomNo2); + //获取要比对的两个bom 获取下面的1物料信息 + ErpBom erpBom = erpBomService.selectBomByBomNo(bomNo1); + ErpBom erpbom1 = erpBomService.selectBomByBomNo(bomNo2); + List list = erpBomService.selectErpBomSubList(erpBom); + List list1 = erpBomService.selectErpBomSubList(erpbom1); + //相同的信息 + List tongList = new ArrayList<>(); + //不同的信息 + List bom1list = new ArrayList<>(); + List bom2list = new ArrayList<>(); + for (ErpBom erpBom3:list){ + for (ErpBom erpBom4:list1){ + String bom1 = erpBom3.getMaterialNo()+"-"+erpBom3.getMaterialName()+"-"+erpBom3.getUseNum(); + String bom2 = erpBom4.getMaterialNo()+"-"+erpBom4.getMaterialName()+"-"+erpBom4.getUseNum(); + if (bom1 == bom2){ + boolean contains = tongList.stream().anyMatch(item-> item.equals(bom1)); + if (!contains){ + tongList.add(bom1); + } + }else{ + boolean contains = bom1list.stream().anyMatch(item-> item.equals(bom1)); + if (!contains){ + bom1list.add(bom1); + } + boolean contains1 = bom2list.stream().anyMatch(item-> item.equals(bom2)); + if (!contains1){ + bom2list.add(bom1); + } + } + } + } + map.put("tongList",tongList); + map.put("bom1list",bom1list); + map.put("bom2list",bom2list); + return map; + } + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/mapper/ErpBomMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/mapper/ErpBomMapper.java index 112ddc1f..6ba99b57 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/erp/mapper/ErpBomMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/mapper/ErpBomMapper.java @@ -118,4 +118,7 @@ public interface ErpBomMapper * @return */ public List selectErpBomByIds(String[] ids); + + + public ErpBom selectBomByBomNo(String bomNo); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/mapper/ErpMaterialMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/mapper/ErpMaterialMapper.java index 07efa787..50e524d6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/erp/mapper/ErpMaterialMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/mapper/ErpMaterialMapper.java @@ -1,7 +1,6 @@ package com.ruoyi.erp.mapper; import com.ruoyi.erp.domain.ErpMaterial; -import io.lettuce.core.dynamic.annotation.Param; import java.util.List; @@ -90,5 +89,5 @@ public interface ErpMaterialMapper /** * 修改物料的关联bom */ - public int updateMaterialBomNo(@Param("bomNo") String bomNo, @Param("materialNo") String materialNo); + public int updateMaterialBomNo(ErpMaterial erpMaterial); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/service/IErpBomService.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/service/IErpBomService.java index a8f1e2cd..f9748e28 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/erp/service/IErpBomService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/service/IErpBomService.java @@ -92,4 +92,8 @@ public interface IErpBomService * @return */ public List selectErpBomByIds(String ids); + /** + * bom对象查询，以bomNo作为条件 + */ + public ErpBom selectBomByBomNo(String bomNo); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/service/IErpMaterialService.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/service/IErpMaterialService.java index e7b19394..4d643dee 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/erp/service/IErpMaterialService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/service/IErpMaterialService.java @@ -88,5 +88,5 @@ public interface IErpMaterialService /** * 修改物料的关联bom */ - public int updateMaterialBomNo( String bomNo, String materialNo); + public int updateMaterialBomNo( ErpMaterial erpMaterial); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpBomServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpBomServiceImpl.java index 6e249273..8e2b3f5b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpBomServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpBomServiceImpl.java @@ -6,6 +6,7 @@ import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.ShiroUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.erp.domain.ErpBom; +import com.ruoyi.erp.domain.ErpMaterial; import com.ruoyi.erp.mapper.ErpBomMapper; import com.ruoyi.erp.service.IErpBomService; import com.ruoyi.erp.service.IErpMaterialService; @@ -81,8 +82,11 @@ public class ErpBomServiceImpl implements IErpBomService erpBom.setBomNo(billNo); int rows = erpBomMapper.insertErpBom(erpBom); insertErpBomSub(erpBom); + ErpMaterial erpMaterial = new ErpMaterial(); + erpMaterial.setMaterialNo(erpBom.getMaterialNo()); + erpMaterial.setBomNo(erpBom.getBomNo()); //添加物料关联的bom信息 - iErpMaterialService.updateMaterialBomNo(erpBom.getBomNo(),erpBom.getMaterialNo()); + iErpMaterialService.updateMaterialBomNo(erpMaterial); return rows; } @@ -130,6 +134,17 @@ public class ErpBomServiceImpl implements IErpBomService public int deleteErpBomByIds(String ids) { erpBomMapper.deleteErpBomByParentIds(Convert.toStrArray(ids)); + List erpBomList = erpBomMapper.selectErpBomByIds(Convert.toStrArray(ids)); + for (ErpBom erpBom:erpBomList){ + //清除物料关联的bom信息 + ErpMaterial erpMaterial = new ErpMaterial(); + erpMaterial.setMaterialNo(erpBom.getMaterialNo()); + erpMaterial.setBomNo(erpBom.getBomNo()); + iErpMaterialService.updateMaterialBomNo(erpMaterial); + } + + + return erpBomMapper.deleteErpBomByIds(Convert.toStrArray(ids)); } @@ -190,6 +205,11 @@ public class ErpBomServiceImpl implements IErpBomService return erpBomMapper.selectErpBomByIds(Convert.toStrArray(ids)); } + @Override + public ErpBom selectBomByBomNo(String bomNo) { + return erpBomMapper.selectBomByBomNo(bomNo); + } + /** * 新增bom信息 * diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpMaterialServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpMaterialServiceImpl.java index 4dab279b..f0c3f5de 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpMaterialServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpMaterialServiceImpl.java @@ -187,7 +187,7 @@ public class ErpMaterialServiceImpl implements IErpMaterialService } @Override - public int updateMaterialBomNo(String bomNo, String materialNo) { - return erpMaterialMapper.updateMaterialBomNo(bomNo,materialNo); + public int updateMaterialBomNo(ErpMaterial erpMaterial) { + return erpMaterialMapper.updateMaterialBomNo(erpMaterial); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysMakeOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysMakeOrderController.java new file mode 100644 index 00000000..0d71461a --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysMakeOrderController.java @@ -0,0 +1,148 @@ +package com.ruoyi.system.controller; + +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.system.domain.SysMakeOrder; +import com.ruoyi.system.service.ISysMakeOrderService; +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 zhang + * @date 2023-12-18 + */ +@Controller +@RequestMapping("/system/makeorder") +public class SysMakeOrderController extends BaseController +{ + private String prefix = "system/makeorder"; + + @Autowired + private ISysMakeOrderService sysMakeOrderService; + + @RequiresPermissions("system:makeorder:view") + @GetMapping() + public String makeorder() + { + return prefix + "/makeorder"; + } + + /** + * 查询生产订单列表 + */ + @RequiresPermissions("system:makeorder:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(SysMakeOrder sysMakeOrder) + { + startPage(); + List list = sysMakeOrderService.selectSysMakeOrderList(sysMakeOrder); + return getDataTable(list); + } + + /** + * 导出生产订单列表 + */ + @RequiresPermissions("system:makeorder:export") + @Log(title = "生产订单", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(SysMakeOrder sysMakeOrder) + { + List list = sysMakeOrderService.selectSysMakeOrderList(sysMakeOrder); + ExcelUtil util = new ExcelUtil(SysMakeOrder.class); + return util.exportExcel(list, "生产订单数据"); + } + + /** + * 新增生产订单 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存生产订单 + */ + @RequiresPermissions("system:makeorder:add") + @Log(title = "生产订单", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(SysMakeOrder sysMakeOrder) + { + return toAjax(sysMakeOrderService.insertSysMakeOrder(sysMakeOrder)); + } + + /** + * 修改生产订单 + */ + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap mmap) + { + SysMakeOrder sysMakeOrder = sysMakeOrderService.selectSysMakeOrderById(id); + mmap.put("sysMakeOrder", sysMakeOrder); + return prefix + "/edit"; + } + + /** + * 修改保存生产订单 + */ + @RequiresPermissions("system:makeorder:edit") + @Log(title = "生产订单", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(SysMakeOrder sysMakeOrder) + { + return toAjax(sysMakeOrderService.updateSysMakeOrder(sysMakeOrder)); + } + + /** + * 删除生产订单 + */ + @RequiresPermissions("system:makeorder:remove") + @Log(title = "生产订单", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(sysMakeOrderService.deleteSysMakeOrderByIds(ids)); + } + + /** + * 作废生产订单 + */ + @RequiresPermissions("system:makeorder:cancel") + @Log(title = "生产订单", businessType = BusinessType.CANCEL) + @GetMapping( "/cancel/{id}") + @ResponseBody + public AjaxResult cancel(@PathVariable("id") Long id){ + return toAjax(sysMakeOrderService.cancelSysMakeOrderById(id)); + } + + /** + * 恢复生产订单 + */ + @RequiresPermissions("system:makeorder:restore") + @Log(title = "生产订单", businessType = BusinessType.RESTORE) + @GetMapping( "/restore/{id}") + @ResponseBody + public AjaxResult restore(@PathVariable("id")Long id) + { + return toAjax(sysMakeOrderService.restoreSysMakeOrderById(id)); + } + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysPickingController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysPickingController.java new file mode 100644 index 00000000..a15af84c --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysPickingController.java @@ -0,0 +1,148 @@ +package com.ruoyi.system.controller; + +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.system.domain.SysPicking; +import com.ruoyi.system.service.ISysPickingService; +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-12-15 + */ +@Controller +@RequestMapping("/system/picking") +public class SysPickingController extends BaseController +{ + private String prefix = "system/picking"; + + @Autowired + private ISysPickingService sysPickingService; + + @RequiresPermissions("system:picking:view") + @GetMapping() + public String picking() + { + return prefix + "/picking"; + } + + /** + * 查询开发修改单领料列表列表 + */ + @RequiresPermissions("system:picking:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(SysPicking sysPicking) + { + startPage(); + List list = sysPickingService.selectSysPickingList(sysPicking); + return getDataTable(list); + } + + /** + * 导出开发修改单领料列表列表 + */ + @RequiresPermissions("system:picking:export") + @Log(title = "开发修改单领料列表", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(SysPicking sysPicking) + { + List list = sysPickingService.selectSysPickingList(sysPicking); + ExcelUtil util = new ExcelUtil(SysPicking.class); + return util.exportExcel(list, "开发修改单领料列表数据"); + } + + /** + * 新增开发修改单领料列表 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存开发修改单领料列表 + */ + @RequiresPermissions("system:picking:add") + @Log(title = "开发修改单领料列表", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(SysPicking sysPicking) + { + return toAjax(sysPickingService.insertSysPicking(sysPicking)); + } + + /** + * 修改开发修改单领料列表 + */ + @GetMapping("/edit/{pickId}") + public String edit(@PathVariable("pickId") Long pickId, ModelMap mmap) + { + SysPicking sysPicking = sysPickingService.selectSysPickingById(pickId); + mmap.put("sysPicking", sysPicking); + return prefix + "/edit"; + } + + /** + * 修改保存开发修改单领料列表 + */ + @RequiresPermissions("system:picking:edit") + @Log(title = "开发修改单领料列表", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(SysPicking sysPicking) + { + return toAjax(sysPickingService.updateSysPicking(sysPicking)); + } + + /** + * 删除开发修改单领料列表 + */ + @RequiresPermissions("system:picking:remove") + @Log(title = "开发修改单领料列表", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(sysPickingService.deleteSysPickingByIds(ids)); + } + + /** + * 作废开发修改单领料列表 + */ + @RequiresPermissions("system:picking:cancel") + @Log(title = "开发修改单领料列表", businessType = BusinessType.CANCEL) + @GetMapping( "/cancel/{id}") + @ResponseBody + public AjaxResult cancel(@PathVariable("id") Long id){ + return toAjax(sysPickingService.cancelSysPickingById(id)); + } + + /** + * 恢复开发修改单领料列表 + */ + @RequiresPermissions("system:picking:restore") + @Log(title = "开发修改单领料列表", businessType = BusinessType.RESTORE) + @GetMapping( "/restore/{id}") + @ResponseBody + public AjaxResult restore(@PathVariable("id")Long id) + { + return toAjax(sysPickingService.restoreSysPickingById(id)); + } + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysProductModelController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysProductModelController.java new file mode 100644 index 00000000..a784e1bb --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysProductModelController.java @@ -0,0 +1,148 @@ +package com.ruoyi.system.controller; + +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.system.domain.SysProductModel; +import com.ruoyi.system.service.ISysProductModelService; +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 zhang + * @date 2023-12-15 + */ +@Controller +@RequestMapping("/system/model") +public class SysProductModelController extends BaseController +{ + private String prefix = "system/model"; + + @Autowired + private ISysProductModelService sysProductModelService; + + @RequiresPermissions("system:model:view") + @GetMapping() + public String model() + { + return prefix + "/model"; + } + + /** + * 查询产品型号管理列表 + */ + @RequiresPermissions("system:model:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(SysProductModel sysProductModel) + { + startPage(); + List list = sysProductModelService.selectSysProductModelList(sysProductModel); + return getDataTable(list); + } + + /** + * 导出产品型号管理列表 + */ + @RequiresPermissions("system:model:export") + @Log(title = "产品型号管理", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(SysProductModel sysProductModel) + { + List list = sysProductModelService.selectSysProductModelList(sysProductModel); + ExcelUtil util = new ExcelUtil(SysProductModel.class); + return util.exportExcel(list, "产品型号管理数据"); + } + + /** + * 新增产品型号管理 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存产品型号管理 + */ + @RequiresPermissions("system:model:add") + @Log(title = "产品型号管理", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(SysProductModel sysProductModel) + { + return toAjax(sysProductModelService.insertSysProductModel(sysProductModel)); + } + + /** + * 修改产品型号管理 + */ + @GetMapping("/edit/{Pid}") + public String edit(@PathVariable("Pid") Long Pid, ModelMap mmap) + { + SysProductModel sysProductModel = sysProductModelService.selectSysProductModelById(Pid); + mmap.put("sysProductModel", sysProductModel); + return prefix + "/edit"; + } + + /** + * 修改保存产品型号管理 + */ + @RequiresPermissions("system:model:edit") + @Log(title = "产品型号管理", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(SysProductModel sysProductModel) + { + return toAjax(sysProductModelService.updateSysProductModel(sysProductModel)); + } + + /** + * 删除产品型号管理 + */ + @RequiresPermissions("system:model:remove") + @Log(title = "产品型号管理", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(sysProductModelService.deleteSysProductModelByIds(ids)); + } + + /** + * 作废产品型号管理 + */ + @RequiresPermissions("system:model:cancel") + @Log(title = "产品型号管理", businessType = BusinessType.CANCEL) + @GetMapping( "/cancel/{id}") + @ResponseBody + public AjaxResult cancel(@PathVariable("id") Long id){ + return toAjax(sysProductModelService.cancelSysProductModelById(id)); + } + + /** + * 恢复产品型号管理 + */ + @RequiresPermissions("system:model:restore") + @Log(title = "产品型号管理", businessType = BusinessType.RESTORE) + @GetMapping( "/restore/{id}") + @ResponseBody + public AjaxResult restore(@PathVariable("id")Long id) + { + return toAjax(sysProductModelService.restoreSysProductModelById(id)); + } + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysMakeOrder.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysMakeOrder.java new file mode 100644 index 00000000..8ad55b95 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysMakeOrder.java @@ -0,0 +1,279 @@ +package com.ruoyi.system.domain; + +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; + +/** + * 生产订单对象 sys_makeorder + * + * @author zhang + * @date 2023-12-18 + */ +public class SysMakeOrder extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 生产订单id */ + private Long id; + + /** 生产状态 */ + @Excel(name = "生产状态") + private String makeStatus; + + /** 入库状态 */ + @Excel(name = "入库状态") + private String eceiptStatus; + + /** 品质状态 */ + @Excel(name = "品质状态") + private String qualityStatus; + + /** 使用状态 */ + @Excel(name = "使用状态") + private String useStatus; + + /** 生产订单号 */ + @Excel(name = "生产订单号") + private String makeNo; + + /** 关联销售订单号 */ + @Excel(name = "关联销售订单号") + private String saleNo; + + /** 业务员 */ + @Excel(name = "业务员") + private String Salesman; + + /** 客户ID */ + @Excel(name = "客户ID") + private String customerId; + + /** 客户名称 */ + @Excel(name = "客户名称") + private String customerName; + + /** 客户订单号 */ + @Excel(name = "客户订单号") + private String customerOderCode; + + /** 物料合计 */ + @Excel(name = "物料合计") + private String material; + + /** 数量合计 */ + @Excel(name = "数量合计") + private Long materialSum; + + /** 已完成数量 */ + @Excel(name = "已完成数量") + private Long finishNum; + + /** 已入库数量 */ + @Excel(name = "已入库数量") + private Long eceiptNum; + + /** 不含税生产成本(RMB) */ + @Excel(name = "不含税生产成本(RMB)") + private Long noRate; + + /** 含税生产成本(RMB) */ + @Excel(name = "含税生产成本(RMB)") + private Long rate; + + /** 使用状态 */ + private String delFlag; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setMakeStatus(String makeStatus) + { + this.makeStatus = makeStatus; + } + + public String getMakeStatus() + { + return makeStatus; + } + public void setEceiptStatus(String eceiptStatus) + { + this.eceiptStatus = eceiptStatus; + } + + public String getEceiptStatus() + { + return eceiptStatus; + } + public void setQualityStatus(String qualityStatus) + { + this.qualityStatus = qualityStatus; + } + + public String getQualityStatus() + { + return qualityStatus; + } + public void setUseStatus(String useStatus) + { + this.useStatus = useStatus; + } + + public String getUseStatus() + { + return useStatus; + } + public void setMakeNo(String makeNo) + { + this.makeNo = makeNo; + } + + public String getMakeNo() + { + return makeNo; + } + public void setSaleNo(String saleNo) + { + this.saleNo = saleNo; + } + + public String getSaleNo() + { + return saleNo; + } + public void setSalesman(String Salesman) + { + this.Salesman = Salesman; + } + + public String getSalesman() + { + return Salesman; + } + public void setCustomerId(String customerId) + { + this.customerId = customerId; + } + + public String getCustomerId() + { + return customerId; + } + public void setCustomerName(String customerName) + { + this.customerName = customerName; + } + + public String getCustomerName() + { + return customerName; + } + public void setCustomerOderCode(String customerOderCode) + { + this.customerOderCode = customerOderCode; + } + + public String getCustomerOderCode() + { + return customerOderCode; + } + public void setMaterial(String material) + { + this.material = material; + } + + public String getMaterial() + { + return material; + } + public void setMaterialSum(Long materialSum) + { + this.materialSum = materialSum; + } + + public Long getMaterialSum() + { + return materialSum; + } + public void setFinishNum(Long finishNum) + { + this.finishNum = finishNum; + } + + public Long getFinishNum() + { + return finishNum; + } + public void setEceiptNum(Long eceiptNum) + { + this.eceiptNum = eceiptNum; + } + + public Long getEceiptNum() + { + return eceiptNum; + } + public void setNoRate(Long noRate) + { + this.noRate = noRate; + } + + public Long getNoRate() + { + return noRate; + } + public void setRate(Long rate) + { + this.rate = rate; + } + + public Long getRate() + { + return rate; + } + public void setDelFlag(String delFlag) + { + this.delFlag = delFlag; + } + + public String getDelFlag() + { + return delFlag; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("makeStatus", getMakeStatus()) + .append("eceiptStatus", getEceiptStatus()) + .append("qualityStatus", getQualityStatus()) + .append("useStatus", getUseStatus()) + .append("makeNo", getMakeNo()) + .append("saleNo", getSaleNo()) + .append("Salesman", getSalesman()) + .append("customerId", getCustomerId()) + .append("customerName", getCustomerName()) + .append("customerOderCode", getCustomerOderCode()) + .append("material", getMaterial()) + .append("materialSum", getMaterialSum()) + .append("finishNum", getFinishNum()) + .append("eceiptNum", getEceiptNum()) + .append("noRate", getNoRate()) + .append("rate", getRate()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .append("delFlag", getDelFlag()) + .toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysPicking.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysPicking.java new file mode 100644 index 00000000..72437a3f --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysPicking.java @@ -0,0 +1,153 @@ +package com.ruoyi.system.domain; + +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; + +/** + * 开发修改单领料列表对象 sys_picking + * + * @author ruoyi + * @date 2023-12-15 + */ +public class SysPicking extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 领料单id */ + private Long pickId; + + /** 领料单号 */ + @Excel(name = "领料单号") + private String pickNo; + + /** 领料状态 */ + @Excel(name = "领料状态") + private String pickStaus; + + /** 关联销售单号 */ + @Excel(name = "关联销售单号") + private String saleNo; + + /** 类型 */ + @Excel(name = "类型") + private String types; + + /** 物料合计 */ + @Excel(name = "物料合计") + private String materialM; + + /** 合计量 */ + @Excel(name = "合计量") + private String materialSum; + + /** 操作 */ + @Excel(name = "操作") + private String opers; + + /** */ + private String pickBy; + + public void setPickId(Long pickId) + { + this.pickId = pickId; + } + + public Long getPickId() + { + return pickId; + } + public void setPickNo(String pickNo) + { + this.pickNo = pickNo; + } + + public String getPickNo() + { + return pickNo; + } + public void setPickStaus(String pickStaus) + { + this.pickStaus = pickStaus; + } + + public String getPickStaus() + { + return pickStaus; + } + public void setSaleNo(String saleNo) + { + this.saleNo = saleNo; + } + + public String getSaleNo() + { + return saleNo; + } + public void setTypes(String types) + { + this.types = types; + } + + public String getTypes() + { + return types; + } + public void setMaterialM(String materialM) + { + this.materialM = materialM; + } + + public String getMaterialM() + { + return materialM; + } + public void setMaterialSum(String materialSum) + { + this.materialSum = materialSum; + } + + public String getMaterialSum() + { + return materialSum; + } + public void setOpers(String opers) + { + this.opers = opers; + } + + public String getOpers() + { + return opers; + } + public void setPickBy(String pickBy) + { + this.pickBy = pickBy; + } + + public String getPickBy() + { + return pickBy; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("pickId", getPickId()) + .append("pickNo", getPickNo()) + .append("pickStaus", getPickStaus()) + .append("createBy", getCreateBy()) + .append("saleNo", getSaleNo()) + .append("types", getTypes()) + .append("materialM", getMaterialM()) + .append("materialSum", getMaterialSum()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("opers", getOpers()) + .append("remark", getRemark()) + .append("pickBy", getPickBy()) + .toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysProductModel.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysProductModel.java new file mode 100644 index 00000000..48153333 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysProductModel.java @@ -0,0 +1,139 @@ +package com.ruoyi.system.domain; + +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; + +/** + * 产品型号管理对象 sys_product_model + * + * @author zhang + * @date 2023-12-15 + */ +public class SysProductModel extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 产品型号管理表id */ + private Long Pid; + + /** 产品型号ID */ + @Excel(name = "产品型号ID") + private String Pcode; + + /** 设备型号 */ + @Excel(name = "设备型号") + private String equipModel; + + /** 设备名称 */ + @Excel(name = "设备名称") + private String equipName; + + /** 规格说明 */ + @Excel(name = "规格说明") + private String specification; + + /** 差异说明 */ + @Excel(name = "差异说明") + private String differences; + + /** 更新人 */ + @Excel(name = "更新人") + private String udpateBy; + + /** 图片地址 */ + @Excel(name = "图片地址") + private String photoUrl; + + public void setPid(Long Pid) + { + this.Pid = Pid; + } + + public Long getPid() + { + return Pid; + } + public void setPcode(String Pcode) + { + this.Pcode = Pcode; + } + + public String getPcode() + { + return Pcode; + } + public void setEquipModel(String equipModel) + { + this.equipModel = equipModel; + } + + public String getEquipModel() + { + return equipModel; + } + public void setEquipName(String equipName) + { + this.equipName = equipName; + } + + public String getEquipName() + { + return equipName; + } + public void setSpecification(String specification) + { + this.specification = specification; + } + + public String getSpecification() + { + return specification; + } + public void setDifferences(String differences) + { + this.differences = differences; + } + + public String getDifferences() + { + return differences; + } + public void setUdpateBy(String udpateBy) + { + this.udpateBy = udpateBy; + } + + public String getUdpateBy() + { + return udpateBy; + } + public void setPhotoUrl(String photoUrl) + { + this.photoUrl = photoUrl; + } + + public String getPhotoUrl() + { + return photoUrl; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("Pid", getPid()) + .append("Pcode", getPcode()) + .append("createBy", getCreateBy()) + .append("equipModel", getEquipModel()) + .append("equipName", getEquipName()) + .append("specification", getSpecification()) + .append("differences", getDifferences()) + .append("remark", getRemark()) + .append("createTime", getCreateTime()) + .append("udpateBy", getUdpateBy()) + .append("updateTime", getUpdateTime()) + .append("photoUrl", getPhotoUrl()) + .toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysMakeOrderMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysMakeOrderMapper.java new file mode 100644 index 00000000..a55cda11 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysMakeOrderMapper.java @@ -0,0 +1,78 @@ +package com.ruoyi.system.mapper; + +import com.ruoyi.system.domain.SysMakeOrder; + +import java.util.List; + +/** + * 生产订单Mapper接口 + * + * @author zhang + * @date 2023-12-18 + */ +public interface SysMakeOrderMapper +{ + /** + * 查询生产订单 + * + * @param id 生产订单ID + * @return 生产订单 + */ + public SysMakeOrder selectSysMakeOrderById(Long id); + + /** + * 查询生产订单列表 + * + * @param sysMakeOrder 生产订单 + * @return 生产订单集合 + */ + public List selectSysMakeOrderList(SysMakeOrder sysMakeOrder); + + /** + * 新增生产订单 + * + * @param sysMakeOrder 生产订单 + * @return 结果 + */ + public int insertSysMakeOrder(SysMakeOrder sysMakeOrder); + + /** + * 修改生产订单 + * + * @param sysMakeOrder 生产订单 + * @return 结果 + */ + public int updateSysMakeOrder(SysMakeOrder sysMakeOrder); + + /** + * 删除生产订单 + * + * @param id 生产订单ID + * @return 结果 + */ + public int deleteSysMakeOrderById(Long id); + + /** + * 批量删除生产订单 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteSysMakeOrderByIds(String[] ids); + + /** + * 作废生产订单 + * + * @param id 生产订单ID + * @return 结果 + */ + public int cancelSysMakeOrderById(Long id); + + /** + * 恢复生产订单 + * + * @param id 生产订单ID + * @return 结果 + */ + public int restoreSysMakeOrderById(Long id); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysPickingMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysPickingMapper.java new file mode 100644 index 00000000..f1110e39 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysPickingMapper.java @@ -0,0 +1,78 @@ +package com.ruoyi.system.mapper; + +import com.ruoyi.system.domain.SysPicking; + +import java.util.List; + +/** + * 开发修改单领料列表Mapper接口 + * + * @author ruoyi + * @date 2023-12-15 + */ +public interface SysPickingMapper +{ + /** + * 查询开发修改单领料列表 + * + * @param pickId 开发修改单领料列表ID + * @return 开发修改单领料列表 + */ + public SysPicking selectSysPickingById(Long pickId); + + /** + * 查询开发修改单领料列表列表 + * + * @param sysPicking 开发修改单领料列表 + * @return 开发修改单领料列表集合 + */ + public List selectSysPickingList(SysPicking sysPicking); + + /** + * 新增开发修改单领料列表 + * + * @param sysPicking 开发修改单领料列表 + * @return 结果 + */ + public int insertSysPicking(SysPicking sysPicking); + + /** + * 修改开发修改单领料列表 + * + * @param sysPicking 开发修改单领料列表 + * @return 结果 + */ + public int updateSysPicking(SysPicking sysPicking); + + /** + * 删除开发修改单领料列表 + * + * @param pickId 开发修改单领料列表ID + * @return 结果 + */ + public int deleteSysPickingById(Long pickId); + + /** + * 批量删除开发修改单领料列表 + * + * @param pickIds 需要删除的数据ID + * @return 结果 + */ + public int deleteSysPickingByIds(String[] pickIds); + + /** + * 作废开发修改单领料列表 + * + * @param pickId 开发修改单领料列表ID + * @return 结果 + */ + public int cancelSysPickingById(Long pickId); + + /** + * 恢复开发修改单领料列表 + * + * @param pickId 开发修改单领料列表ID + * @return 结果 + */ + public int restoreSysPickingById(Long pickId); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysProductModelMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysProductModelMapper.java new file mode 100644 index 00000000..22cea5fa --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysProductModelMapper.java @@ -0,0 +1,78 @@ +package com.ruoyi.system.mapper; + +import com.ruoyi.system.domain.SysProductModel; + +import java.util.List; + +/** + * 产品型号管理Mapper接口 + * + * @author zhang + * @date 2023-12-15 + */ +public interface SysProductModelMapper +{ + /** + * 查询产品型号管理 + * + * @param Pid 产品型号管理ID + * @return 产品型号管理 + */ + public SysProductModel selectSysProductModelById(Long Pid); + + /** + * 查询产品型号管理列表 + * + * @param sysProductModel 产品型号管理 + * @return 产品型号管理集合 + */ + public List selectSysProductModelList(SysProductModel sysProductModel); + + /** + * 新增产品型号管理 + * + * @param sysProductModel 产品型号管理 + * @return 结果 + */ + public int insertSysProductModel(SysProductModel sysProductModel); + + /** + * 修改产品型号管理 + * + * @param sysProductModel 产品型号管理 + * @return 结果 + */ + public int updateSysProductModel(SysProductModel sysProductModel); + + /** + * 删除产品型号管理 + * + * @param Pid 产品型号管理ID + * @return 结果 + */ + public int deleteSysProductModelById(Long Pid); + + /** + * 批量删除产品型号管理 + * + * @param Pids 需要删除的数据ID + * @return 结果 + */ + public int deleteSysProductModelByIds(String[] Pids); + + /** + * 作废产品型号管理 + * + * @param Pid 产品型号管理ID + * @return 结果 + */ + public int cancelSysProductModelById(Long Pid); + + /** + * 恢复产品型号管理 + * + * @param Pid 产品型号管理ID + * @return 结果 + */ + public int restoreSysProductModelById(Long Pid); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysMakeOrderService.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysMakeOrderService.java new file mode 100644 index 00000000..f4405326 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysMakeOrderService.java @@ -0,0 +1,76 @@ +package com.ruoyi.system.service; + +import com.ruoyi.system.domain.SysMakeOrder; + +import java.util.List; + +/** + * 生产订单Service接口 + * + * @author zhang + * @date 2023-12-18 + */ +public interface ISysMakeOrderService +{ + /** + * 查询生产订单 + * + * @param id 生产订单ID + * @return 生产订单 + */ + public SysMakeOrder selectSysMakeOrderById(Long id); + + /** + * 查询生产订单列表 + * + * @param sysMakeOrder 生产订单 + * @return 生产订单集合 + */ + public List selectSysMakeOrderList(SysMakeOrder sysMakeOrder); + + /** + * 新增生产订单 + * + * @param sysMakeOrder 生产订单 + * @return 结果 + */ + public int insertSysMakeOrder(SysMakeOrder sysMakeOrder); + + /** + * 修改生产订单 + * + * @param sysMakeOrder 生产订单 + * @return 结果 + */ + public int updateSysMakeOrder(SysMakeOrder sysMakeOrder); + + /** + * 批量删除生产订单 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteSysMakeOrderByIds(String ids); + + /** + * 删除生产订单信息 + * + * @param id 生产订单ID + * @return 结果 + */ + public int deleteSysMakeOrderById(Long id); + + /** + * 作废生产订单 + * @param id 生产订单ID + * @return + */ + int cancelSysMakeOrderById(Long id); + + /** + * 恢复生产订单 + * @param id 生产订单ID + * @return + */ + int restoreSysMakeOrderById(Long id); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysPickingService.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysPickingService.java new file mode 100644 index 00000000..2c253b0c --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysPickingService.java @@ -0,0 +1,76 @@ +package com.ruoyi.system.service; + +import com.ruoyi.system.domain.SysPicking; + +import java.util.List; + +/** + * 开发修改单领料列表Service接口 + * + * @author ruoyi + * @date 2023-12-15 + */ +public interface ISysPickingService +{ + /** + * 查询开发修改单领料列表 + * + * @param pickId 开发修改单领料列表ID + * @return 开发修改单领料列表 + */ + public SysPicking selectSysPickingById(Long pickId); + + /** + * 查询开发修改单领料列表列表 + * + * @param sysPicking 开发修改单领料列表 + * @return 开发修改单领料列表集合 + */ + public List selectSysPickingList(SysPicking sysPicking); + + /** + * 新增开发修改单领料列表 + * + * @param sysPicking 开发修改单领料列表 + * @return 结果 + */ + public int insertSysPicking(SysPicking sysPicking); + + /** + * 修改开发修改单领料列表 + * + * @param sysPicking 开发修改单领料列表 + * @return 结果 + */ + public int updateSysPicking(SysPicking sysPicking); + + /** + * 批量删除开发修改单领料列表 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteSysPickingByIds(String ids); + + /** + * 删除开发修改单领料列表信息 + * + * @param pickId 开发修改单领料列表ID + * @return 结果 + */ + public int deleteSysPickingById(Long pickId); + + /** + * 作废开发修改单领料列表 + * @param pickId 开发修改单领料列表ID + * @return + */ + int cancelSysPickingById(Long pickId); + + /** + * 恢复开发修改单领料列表 + * @param pickId 开发修改单领料列表ID + * @return + */ + int restoreSysPickingById(Long pickId); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysProductModelService.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysProductModelService.java new file mode 100644 index 00000000..04f3c555 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysProductModelService.java @@ -0,0 +1,76 @@ +package com.ruoyi.system.service; + +import com.ruoyi.system.domain.SysProductModel; + +import java.util.List; + +/** + * 产品型号管理Service接口 + * + * @author zhang + * @date 2023-12-15 + */ +public interface ISysProductModelService +{ + /** + * 查询产品型号管理 + * + * @param Pid 产品型号管理ID + * @return 产品型号管理 + */ + public SysProductModel selectSysProductModelById(Long Pid); + + /** + * 查询产品型号管理列表 + * + * @param sysProductModel 产品型号管理 + * @return 产品型号管理集合 + */ + public List selectSysProductModelList(SysProductModel sysProductModel); + + /** + * 新增产品型号管理 + * + * @param sysProductModel 产品型号管理 + * @return 结果 + */ + public int insertSysProductModel(SysProductModel sysProductModel); + + /** + * 修改产品型号管理 + * + * @param sysProductModel 产品型号管理 + * @return 结果 + */ + public int updateSysProductModel(SysProductModel sysProductModel); + + /** + * 批量删除产品型号管理 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteSysProductModelByIds(String ids); + + /** + * 删除产品型号管理信息 + * + * @param Pid 产品型号管理ID + * @return 结果 + */ + public int deleteSysProductModelById(Long Pid); + + /** + * 作废产品型号管理 + * @param Pid 产品型号管理ID + * @return + */ + int cancelSysProductModelById(Long Pid); + + /** + * 恢复产品型号管理 + * @param Pid 产品型号管理ID + * @return + */ + int restoreSysProductModelById(Long Pid); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeOrderServiceImpl.java new file mode 100644 index 00000000..063370ad --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeOrderServiceImpl.java @@ -0,0 +1,127 @@ +package com.ruoyi.system.service.impl; + +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.ShiroUtils; +import com.ruoyi.system.domain.SysMakeOrder; +import com.ruoyi.system.mapper.SysMakeOrderMapper; +import com.ruoyi.system.service.ISysMakeOrderService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 生产订单Service业务层处理 + * + * @author zhang + * @date 2023-12-18 + */ +@Service +public class SysMakeOrderServiceImpl implements ISysMakeOrderService +{ + @Autowired + private SysMakeOrderMapper sysMakeOrderMapper; + + /** + * 查询生产订单 + * + * @param id 生产订单ID + * @return 生产订单 + */ + @Override + public SysMakeOrder selectSysMakeOrderById(Long id) + { + return sysMakeOrderMapper.selectSysMakeOrderById(id); + } + + /** + * 查询生产订单列表 + * + * @param sysMakeOrder 生产订单 + * @return 生产订单 + */ + @Override + public List selectSysMakeOrderList(SysMakeOrder sysMakeOrder) + { + return sysMakeOrderMapper.selectSysMakeOrderList(sysMakeOrder); + } + + /** + * 新增生产订单 + * + * @param sysMakeOrder 生产订单 + * @return 结果 + */ + @Override + public int insertSysMakeOrder(SysMakeOrder sysMakeOrder) + { + String loginName = ShiroUtils.getLoginName(); + sysMakeOrder.setCreateBy(loginName); + sysMakeOrder.setCreateTime(DateUtils.getNowDate()); + return sysMakeOrderMapper.insertSysMakeOrder(sysMakeOrder); + } + + /** + * 修改生产订单 + * + * @param sysMakeOrder 生产订单 + * @return 结果 + */ + @Override + public int updateSysMakeOrder(SysMakeOrder sysMakeOrder) + { + String loginName = ShiroUtils.getLoginName(); + sysMakeOrder.setUpdateBy(loginName); + sysMakeOrder.setUpdateTime(DateUtils.getNowDate()); + return sysMakeOrderMapper.updateSysMakeOrder(sysMakeOrder); + } + + /** + * 删除生产订单对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteSysMakeOrderByIds(String ids) + { + return sysMakeOrderMapper.deleteSysMakeOrderByIds(Convert.toStrArray(ids)); + } + + /** + * 删除生产订单信息 + * + * @param id 生产订单ID + * @return 结果 + */ + @Override + public int deleteSysMakeOrderById(Long id) + { + return sysMakeOrderMapper.deleteSysMakeOrderById(id); + } + + /** + * 作废生产订单 + * + * @param id 生产订单ID + * @return 结果 + */ + @Override + public int cancelSysMakeOrderById(Long id) + { + return sysMakeOrderMapper.cancelSysMakeOrderById(id); + } + + /** + * 恢复生产订单信息 + * + * @param id 生产订单ID + * @return 结果 + */ + @Override + public int restoreSysMakeOrderById(Long id) + { + return sysMakeOrderMapper.restoreSysMakeOrderById(id); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysPickingServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysPickingServiceImpl.java new file mode 100644 index 00000000..feaeb20a --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysPickingServiceImpl.java @@ -0,0 +1,127 @@ +package com.ruoyi.system.service.impl; + +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.ShiroUtils; +import com.ruoyi.system.domain.SysPicking; +import com.ruoyi.system.mapper.SysPickingMapper; +import com.ruoyi.system.service.ISysPickingService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 开发修改单领料列表Service业务层处理 + * + * @author ruoyi + * @date 2023-12-15 + */ +@Service +public class SysPickingServiceImpl implements ISysPickingService +{ + @Autowired + private SysPickingMapper sysPickingMapper; + + /** + * 查询开发修改单领料列表 + * + * @param pickId 开发修改单领料列表ID + * @return 开发修改单领料列表 + */ + @Override + public SysPicking selectSysPickingById(Long pickId) + { + return sysPickingMapper.selectSysPickingById(pickId); + } + + /** + * 查询开发修改单领料列表列表 + * + * @param sysPicking 开发修改单领料列表 + * @return 开发修改单领料列表 + */ + @Override + public List selectSysPickingList(SysPicking sysPicking) + { + return sysPickingMapper.selectSysPickingList(sysPicking); + } + + /** + * 新增开发修改单领料列表 + * + * @param sysPicking 开发修改单领料列表 + * @return 结果 + */ + @Override + public int insertSysPicking(SysPicking sysPicking) + { + String loginName = ShiroUtils.getLoginName(); + sysPicking.setCreateBy(loginName); + sysPicking.setCreateTime(DateUtils.getNowDate()); + return sysPickingMapper.insertSysPicking(sysPicking); + } + + /** + * 修改开发修改单领料列表 + * + * @param sysPicking 开发修改单领料列表 + * @return 结果 + */ + @Override + public int updateSysPicking(SysPicking sysPicking) + { + String loginName = ShiroUtils.getLoginName(); + sysPicking.setUpdateBy(loginName); + sysPicking.setUpdateTime(DateUtils.getNowDate()); + return sysPickingMapper.updateSysPicking(sysPicking); + } + + /** + * 删除开发修改单领料列表对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteSysPickingByIds(String ids) + { + return sysPickingMapper.deleteSysPickingByIds(Convert.toStrArray(ids)); + } + + /** + * 删除开发修改单领料列表信息 + * + * @param pickId 开发修改单领料列表ID + * @return 结果 + */ + @Override + public int deleteSysPickingById(Long pickId) + { + return sysPickingMapper.deleteSysPickingById(pickId); + } + + /** + * 作废开发修改单领料列表 + * + * @param pickId 开发修改单领料列表ID + * @return 结果 + */ + @Override + public int cancelSysPickingById(Long pickId) + { + return sysPickingMapper.cancelSysPickingById(pickId); + } + + /** + * 恢复开发修改单领料列表信息 + * + * @param pickId 开发修改单领料列表ID + * @return 结果 + */ + @Override + public int restoreSysPickingById(Long pickId) + { + return sysPickingMapper.restoreSysPickingById(pickId); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysProductModelServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysProductModelServiceImpl.java new file mode 100644 index 00000000..94d92436 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysProductModelServiceImpl.java @@ -0,0 +1,125 @@ +package com.ruoyi.system.service.impl; + +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.ShiroUtils; +import com.ruoyi.system.domain.SysProductModel; +import com.ruoyi.system.mapper.SysProductModelMapper; +import com.ruoyi.system.service.ISysProductModelService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 产品型号管理Service业务层处理 + * + * @author zhang + * @date 2023-12-15 + */ +@Service +public class SysProductModelServiceImpl implements ISysProductModelService +{ + @Autowired + private SysProductModelMapper sysProductModelMapper; + + /** + * 查询产品型号管理 + * + * @param Pid 产品型号管理ID + * @return 产品型号管理 + */ + @Override + public SysProductModel selectSysProductModelById(Long Pid) + { + return sysProductModelMapper.selectSysProductModelById(Pid); + } + + /** + * 查询产品型号管理列表 + * + * @param sysProductModel 产品型号管理 + * @return 产品型号管理 + */ + @Override + public List selectSysProductModelList(SysProductModel sysProductModel) + { + return sysProductModelMapper.selectSysProductModelList(sysProductModel); + } + + /** + * 新增产品型号管理 + * + * @param sysProductModel 产品型号管理 + * @return 结果 + */ + @Override + public int insertSysProductModel(SysProductModel sysProductModel) + { + String loginName = ShiroUtils.getLoginName(); + sysProductModel.setCreateBy(loginName); + sysProductModel.setCreateTime(DateUtils.getNowDate()); + return sysProductModelMapper.insertSysProductModel(sysProductModel); + } + + /** + * 修改产品型号管理 + * + * @param sysProductModel 产品型号管理 + * @return 结果 + */ + @Override + public int updateSysProductModel(SysProductModel sysProductModel) + { + sysProductModel.setUpdateTime(DateUtils.getNowDate()); + return sysProductModelMapper.updateSysProductModel(sysProductModel); + } + + /** + * 删除产品型号管理对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteSysProductModelByIds(String ids) + { + return sysProductModelMapper.deleteSysProductModelByIds(Convert.toStrArray(ids)); + } + + /** + * 删除产品型号管理信息 + * + * @param Pid 产品型号管理ID + * @return 结果 + */ + @Override + public int deleteSysProductModelById(Long Pid) + { + return sysProductModelMapper.deleteSysProductModelById(Pid); + } + + /** + * 作废产品型号管理 + * + * @param Pid 产品型号管理ID + * @return 结果 + */ + @Override + public int cancelSysProductModelById(Long Pid) + { + return sysProductModelMapper.cancelSysProductModelById(Pid); + } + + /** + * 恢复产品型号管理信息 + * + * @param Pid 产品型号管理ID + * @return 结果 + */ + @Override + public int restoreSysProductModelById(Long Pid) + { + return sysProductModelMapper.restoreSysProductModelById(Pid); + } +} diff --git a/ruoyi-admin/src/main/resources/mapper/erp/ErpBomMapper.xml b/ruoyi-admin/src/main/resources/mapper/erp/ErpBomMapper.xml index 13deba7a..22f339fb 100644 --- a/ruoyi-admin/src/main/resources/mapper/erp/ErpBomMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/erp/ErpBomMapper.xml @@ -67,6 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and id = #{id} and del_flag = #{delFlag} + and erp.create_time between #{params.beginCreateTime} and #{params.endCreateTime} and create_by = #{createBy} and create_time = #{createTime} and update_by = #{updateBy} @@ -152,6 +153,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{delFlag}, #{createBy}, + #{createTime}, #{updateBy}, #{updateTime}, #{remark}, @@ -205,7 +207,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" delete from erp_bom where id = #{id} - + delete from erp_bom where id in #{id} @@ -220,7 +222,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update erp_bom set del_flag = '0' where id = #{id} - + delete from erp_bom where parent_id in #{parentId} @@ -252,10 +254,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update erp_bom set use_status = #{useStatus} where id = #{id} - select * from erp_bom where id in #{id} + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/erp/ErpMaterialMapper.xml b/ruoyi-admin/src/main/resources/mapper/erp/ErpMaterialMapper.xml index 86e8b813..9566b2e2 100644 --- a/ruoyi-admin/src/main/resources/mapper/erp/ErpMaterialMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/erp/ErpMaterialMapper.xml @@ -30,11 +30,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, del_flag, create_by, create_time, update_by, update_time, remark, material_no, material_name, audit_status, use_status, hava_product_tem,product_item,itemName, material_type, process_method, unit, brand, `describe`, warehouse_dept from erp_material + select id, del_flag, create_by, create_time, update_by, update_time, remark,bomNo, material_no, material_name, audit_status, use_status, hava_product_tem,product_item,itemName, material_type, process_method, unit, brand, `describe`, warehouse_dept from erp_material + + + and make_status = #{makeStatus} + and eceipt_status = #{eceiptStatus} + and quality_status = #{qualityStatus} + and use_status = #{useStatus} + and makeNo = #{makeNo} + and saleNo = #{saleNo} + and Salesman = #{Salesman} + and customerId = #{customerId} + and customerName like concat('%', #{customerName}, '%') + and customerOderCode = #{customerOderCode} + and create_time between #{params.beginCreateTime} and #{params.endCreateTime} + + + + + + + insert into sys_makeorder + + make_status, + eceipt_status, + quality_status, + use_status, + makeNo, + saleNo, + Salesman, + customerId, + customerName, + customerOderCode, + material, + materialSum, + finishNum, + eceiptNum, + noRate, + rate, + create_by, + create_time, + update_by, + update_time, + remark, + del_flag, + + + #{makeStatus}, + #{eceiptStatus}, + #{qualityStatus}, + #{useStatus}, + #{makeNo}, + #{saleNo}, + #{Salesman}, + #{customerId}, + #{customerName}, + #{customerOderCode}, + #{material}, + #{materialSum}, + #{finishNum}, + #{eceiptNum}, + #{noRate}, + #{rate}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + #{delFlag}, + + + + + update sys_makeorder + + make_status = #{makeStatus}, + eceipt_status = #{eceiptStatus}, + quality_status = #{qualityStatus}, + use_status = #{useStatus}, + makeNo = #{makeNo}, + saleNo = #{saleNo}, + Salesman = #{Salesman}, + customerId = #{customerId}, + customerName = #{customerName}, + customerOderCode = #{customerOderCode}, + material = #{material}, + materialSum = #{materialSum}, + finishNum = #{finishNum}, + eceiptNum = #{eceiptNum}, + noRate = #{noRate}, + rate = #{rate}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + remark = #{remark}, + del_flag = #{delFlag}, + + where id = #{id} + + + + delete from sys_makeorder where id = #{id} + + + + delete from sys_makeorder where id in + + #{id} + + + + + update sys_makeorder set del_flag = '1' where id = #{id} + + + + update sys_makeorder set del_flag = '0' where id = #{id} + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysPickingMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysPickingMapper.xml new file mode 100644 index 00000000..ac64e6ee --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/system/SysPickingMapper.xml @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + select pickId, pickNo, pickStaus, create_by, saleNo, types, materialM, materialSum, create_time, update_by, update_time, opers, remark, pick_by from sys_picking + + + + + + + + insert into sys_picking + + pickId, + pickNo, + pickStaus, + create_by, + saleNo, + types, + materialM, + materialSum, + create_time, + update_by, + update_time, + opers, + remark, + pick_by, + + + #{pickId}, + #{pickNo}, + #{pickStaus}, + #{createBy}, + #{saleNo}, + #{types}, + #{materialM}, + #{materialSum}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{opers}, + #{remark}, + #{pickBy}, + + + + + update sys_picking + + pickNo = #{pickNo}, + pickStaus = #{pickStaus}, + create_by = #{createBy}, + saleNo = #{saleNo}, + types = #{types}, + materialM = #{materialM}, + materialSum = #{materialSum}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + opers = #{opers}, + remark = #{remark}, + pick_by = #{pickBy}, + + where pickId = #{pickId} + + + + delete from sys_picking where pickId = #{pickId} + + + + delete from sys_picking where pickId in + + #{pickId} + + + + + update sys_picking set del_flag = '1' where pickId = #{pickId} + + + + update sys_picking set del_flag = '0' where pickId = #{pickId} + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysProductModelMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysProductModelMapper.xml new file mode 100644 index 00000000..74026c0b --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/system/SysProductModelMapper.xml @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + + + + select Pid, Pcode, create_by, equipModel, equipName, specification, differences, remark, create_time, udpate_by, update_time, photoUrl from sys_product_model + + + + + + + + insert into sys_product_model + + Pid, + Pcode, + create_by, + equipModel, + equipName, + specification, + differences, + remark, + create_time, + udpate_by, + update_time, + photoUrl, + + + #{Pid}, + #{Pcode}, + #{createBy}, + #{equipModel}, + #{equipName}, + #{specification}, + #{differences}, + #{remark}, + #{createTime}, + #{udpateBy}, + #{updateTime}, + #{photoUrl}, + + + + + update sys_product_model + + Pcode = #{Pcode}, + create_by = #{createBy}, + equipModel = #{equipModel}, + equipName = #{equipName}, + specification = #{specification}, + differences = #{differences}, + remark = #{remark}, + create_time = #{createTime}, + udpate_by = #{udpateBy}, + update_time = #{updateTime}, + photoUrl = #{photoUrl}, + + where Pid = #{Pid} + + + + delete from sys_product_model where Pid = #{Pid} + + + + delete from sys_product_model where Pid in + + #{Pid} + + + + + update sys_product_model set del_flag = '1' where Pid = #{Pid} + + + + update sys_product_model set del_flag = '0' where Pid = #{Pid} + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/fixed-columns/css/bootstrap-table-fixed-columns.css b/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/fixed-columns/css/bootstrap-table-fixed-columns.css index 367dc098..45f61d91 100644 --- a/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/fixed-columns/css/bootstrap-table-fixed-columns.css +++ b/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/fixed-columns/css/bootstrap-table-fixed-columns.css @@ -35,6 +35,6 @@ animation: none; } -.bootstrap-table .table-hover > tbody > tr.hover > td{ +.bootstrap-table .table-hover > tbody > tr.hover > td { background-color: #f5f5f5; -} \ No newline at end of file +} diff --git a/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/fixed-columns/js/bootstrap-table-fixed-columns.js b/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/fixed-columns/js/bootstrap-table-fixed-columns.js index 58a24642..1b84fd78 100644 --- a/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/fixed-columns/js/bootstrap-table-fixed-columns.js +++ b/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/fixed-columns/js/bootstrap-table-fixed-columns.js @@ -1,14 +1,11 @@ -/** - * @author zhixin wen - * @version: v1.0.1 - */ - (function ($) { 'use strict'; $.extend($.fn.bootstrapTable.defaults, { - fixedColumns: tr, - fixedRightNumber:1, + leftFixedColumns: false, + leftFixedNumber: 1, + rightFixedColumns: false, + rightFixedNumber: 1 }); var BootstrapTable = $.fn.bootstrapTable.Constructor, @@ -17,83 +14,169 @@ _resetView = BootstrapTable.prototype.resetView; BootstrapTable.prototype.initFixedColumns = function () { - this.$fixedHeader = $([ - '
', - '', - '', - '
', - '
'].join('')); - this.timeoutHeaderColumns_ = 0; - this.$fixedHeader.find('table').attr('class', this.$el.attr('class')); - this.$fixedHeaderColumns = this.$fixedHeader.find('thead'); - this.$tableHeader.before(this.$fixedHeader); - - this.$fixedBody = $([ - '
', - '', - '', - '
', - '
'].join('')); - this.timeoutBodyColumns_ = 0; - this.$fixedBody.find('table').attr('class', this.$el.attr('class')); - this.$fixedBodyColumns = this.$fixedBody.find('tbody'); - this.$tableBody.before(this.$fixedBody); + if (this.options.leftFixedColumns) { + this.$fixedHeader = $([ + '
', + '', + '', + '
', + '
'].join('')); + + this.$fixedHeader.find('table').attr('class', this.$el.attr('class')); + this.$fixedHeaderColumns = this.$fixedHeader.find('thead'); + this.$tableHeader.before(this.$fixedHeader); + + this.$fixedBody = $([ + '
', + '', + '', + '
', + '
'].join('')); + + this.$fixedBody.find('table').attr('class', this.$el.attr('class')); + this.$fixedBodyColumns = this.$fixedBody.find('tbody'); + this.$tableBody.before(this.$fixedBody); + //this.$fixedBody = $([ + // '
', + // '', + // '', + // '', + // '
', + // '
'].join('')); + + + //this.$fixedBody.find('table').attr('class', this.$el.attr('class')); + //this.$fixedHeaderColumns = this.$fixedBody.find('thead'); + //this.$fixedBodyColumns = this.$fixedBody.find('tbody'); + //this.$tableBody.before(this.$fixedBody); + } + if (this.options.rightFixedColumns) { + this.$rightfixedHeader = $([ + '
', + '', + '', + '
', + '
'].join('')); + + this.$rightfixedHeader.find('table').attr('class', this.$el.attr('class')); + this.$rightfixedHeaderColumns = this.$rightfixedHeader.find('thead'); + this.$tableHeader.before(this.$rightfixedHeader); + + this.$rightfixedBody = $([ + '
', + '', + '', + '
', + '
'].join('')); + + this.$rightfixedBody.find('table').attr('class', this.$el.attr('class')); + this.$rightfixedBodyColumns = this.$rightfixedBody.find('tbody'); + this.$tableBody.before(this.$rightfixedBody); + + //this.$rightfixedBody = $([ + // '
', + // '', + // '', + // '', + // '
', + // '
'].join('')); + + //this.$rightfixedBody.find('table').attr('class', this.$el.attr('class')).css('position', 'relative').css('border', '1px solid #ddd'); + //this.$rightfixedHeaderColumns = this.$rightfixedBody.find('thead'); + //this.$rightfixedBodyColumns = this.$rightfixedBody.find('tbody'); + //this.$tableBody.before(this.$rightfixedBody); + } }; BootstrapTable.prototype.initHeader = function () { _initHeader.apply(this, Array.prototype.slice.apply(arguments)); - if (!this.options.fixedColumns) { + if (!this.options.leftFixedColumns && !this.options.rightFixedColumns) { return; } - this.initFixedColumns(); - var that = this, $trs = this.$header.find('tr').clone(); - $trs.each(function () { - $(this).find('th:gt(' + that.options.fixedNumber + ')').remove(); - }); - this.$fixedHeaderColumns.html('').append($trs); + var $tr = this.$header.find('tr:eq(0)').clone(), + $ths = $tr.clone().find('th'); + + //$tr.html(''); + //左边列冻结 + if (this.options.leftFixedColumns) { + var $newtr = $(''); + $newtr.attr('data-index', $tr.attr('data-index')); + $newtr.attr('data-uniqueid', $tr.attr('data-uniqueid')); + debugger; + for (var i = 0; i < this.options.leftFixedNumber; i++) { + $newtr.append($ths.eq(i).clone()); + } + this.$fixedHeaderColumns.html('').append($newtr); + } + //$tr.html(''); + //右边列冻结 + if (this.options.rightFixedColumns) { + debugger; + var $newtr2 = $(''); + $newtr2.attr('data-index', $tr.attr('data-index')); + $newtr2.attr('data-uniqueid', $tr.attr('data-uniqueid')); + for (var i = 0; i < this.options.rightFixedNumber; i++) { + $newtr2.append($ths.eq($ths.length - this.options.rightFixedNumber + i).clone()); + } + this.$rightfixedHeaderColumns.html('').append($newtr2); + } }; BootstrapTable.prototype.initBody = function () { _initBody.apply(this, Array.prototype.slice.apply(arguments)); - if (!this.options.fixedColumns) { + if (!this.options.leftFixedColumns && !this.options.rightFixedColumns) { return; } - var that = this, - rowspan = 0; - - this.$fixedBodyColumns.html(''); - this.$body.find('> tr[data-index]').each(function () { - var $tr = $(this).clone(), - $tds = $tr.find('td'); - - $tr.html(''); - var end = that.options.fixedNumber; - if (rowspan > 0) { - --end; - --rowspan; - } - for (var i = 0; i < end; i++) { - $tr.append($tds.eq(i).clone()); - } - that.$fixedBodyColumns.append($tr); - - if ($tds.eq(0).attr('rowspan')){ - rowspan = $tds.eq(0).attr('rowspan') - 1; - } - }); + var that = this; + if (this.options.leftFixedColumns) { + this.$fixedBodyColumns.html(''); + this.$body.find('> tr[data-index]').each(function () { + var $tr = $(this).clone(), + $tds = $tr.clone().find('td'); + + $tr.html(''); + for (var i = 0; i < that.options.leftFixedNumber; i++) { + $tr.append($tds.eq(i).clone()); + } + that.$fixedBodyColumns.append($tr); + }); + } + if (this.options.rightFixedColumns) { + this.$rightfixedBodyColumns.html(''); + this.$body.find('> tr[data-index]').each(function () { + var $tr = $(this).clone(), + $tds = $tr.clone().find('td'); + + $tr.html(''); + for (var i = 0; i < that.options.rightFixedNumber; i++) { + var indexTd = $tds.length - that.options.rightFixedNumber + i; + var oldTd = $tds.eq(indexTd); + var fixTd = oldTd.clone(); + var buttons = fixTd.find('button'); + //事件转移：冻结列里面的事件转移到实际按钮的事件 + buttons.each(function (key, item) { + $(item).click(function () { + that.$body.find("tr[data-index=" + $tr.attr('data-index') + "] td:eq(" + indexTd + ") button:eq(" + key + ")").click(); + }); + }); + $tr.append(fixTd); + } + that.$rightfixedBodyColumns.append($tr); + }); + } }; BootstrapTable.prototype.resetView = function () { _resetView.apply(this, Array.prototype.slice.apply(arguments)); - if (!this.options.fixedColumns) { + if (!this.options.leftFixedColumns && !this.options.rightFixedColumns) { return; } @@ -108,70 +191,134 @@ var that = this, visibleFields = this.getVisibleFields(), headerWidth = 0; - - this.$body.find('tr:first-child:not(.no-records-found) > *').each(function (i) { - var $this = $(this), - index = i; - - if (i >= that.options.fixedNumber) { - return false; - } - - if (that.options.detailView && !that.options.cardView) { - index = i - 1; - } - - that.$fixedHeader.find('th[data-field="' + visibleFields[index] + '"]') - .find('.fht-cell').width($this.innerWidth()); - headerWidth += $this.outerWidth(); - }); - this.$fixedHeader.width(headerWidth + 1).show(); + if (that.options.leftFixedColumns) { + this.$body.find('tr:first-child:not(.no-records-found) > *').each(function (i) { + var $this = $(this), + index = i; + + if (i >= that.options.leftFixedNumber) { + return false; + } + + if (that.options.detailView && !that.options.cardView) { + index = i - 1; + } + + that.$fixedHeader.find('thead th[data-field="' + visibleFields[index] + '"]') + .find('.fht-cell').width($this.innerWidth() - 1); + headerWidth += $this.outerWidth(); + }); + this.$fixedHeader.width(headerWidth - 1).show(); + } + if (that.options.rightFixedColumns) { + this.$body.find('tr:first-child:not(.no-records-found) > *').each(function (i) { + var $this = $(this), + index = i; + + if (i >= visibleFields.length - that.options.rightFixedNumber) { + //return false; + + + //if (that.options.detailView && !that.options.cardView) { + // index = i - 1; + //} + debugger; + that.$rightfixedHeader.find('thead th[data-field="' + visibleFields[index] + '"]') + .find('.fht-cell').width($this.innerWidth()); + headerWidth += $this.outerWidth(); + } + }); + debugger; + this.$rightfixedHeader.width(headerWidth - 1).show(); + } }; BootstrapTable.prototype.fitBodyColumns = function () { var that = this, top = -(parseInt(this.$el.css('margin-top')) - 2), - // the fixed height should reduce the scorll-x height - height = this.$tableBody.height() - 14; + height = this.$tableBody.height() - 2; - if (!this.$body.find('> tr[data-index]').length) { - this.$fixedBody.hide(); - return; - } + if (that.options.leftFixedColumns) { + if (!this.$body.find('> tr[data-index]').length) { + this.$fixedBody.hide(); + return; + } + if (!this.options.height) { + top = this.$fixedHeader.height() - 1; + height = height - top; + } - if (!this.options.height) { - top = this.$fixedHeader.height(); - height = height - top; + this.$fixedBody.css({ + width: this.$fixedHeader.width(), + height: height, + top: top + 1 + }).show(); + + + this.$body.find('> tr').each(function (i) { + that.$fixedBody.find('tbody tr:eq(' + i + ')').height($(this).height()); + }); + + //// events + this.$tableBody.on('scroll', function () { + that.$fixedBody.find('table').css('top', -$(this).scrollTop()); + }); + this.$body.find('> tr[data-index]').off('hover').hover(function () { + var index = $(this).data('index'); + that.$fixedBody.find('tr[data-index="' + index + '"]').addClass('hover'); + }, function () { + var index = $(this).data('index'); + that.$fixedBody.find('tr[data-index="' + index + '"]').removeClass('hover'); + }); + this.$fixedBody.find('tr[data-index]').off('hover').hover(function () { + var index = $(this).data('index'); + that.$body.find('tr[data-index="' + index + '"]').addClass('hover'); + }, function () { + var index = $(this).data('index'); + that.$body.find('> tr[data-index="' + index + '"]').removeClass('hover'); + }); } + if (that.options.rightFixedColumns) { + if (!this.$body.find('> tr[data-index]').length) { + this.$rightfixedBody.hide(); + return; + } + if (!this.options.height) { + top = this.$rightfixedHeader.height() - 1; + height = height - top; + } - this.$fixedBody.css({ - width: this.$fixedHeader.width(), - height: height, - top: top - }).show(); - - this.$body.find('> tr').each(function (i) { - that.$fixedBody.find('tr:eq(' + i + ')').height($(this).height() - 1); - }); - - // events - this.$tableBody.on('scroll', function () { - that.$fixedBody.find('table').css('top', -$(this).scrollTop()); - }); - this.$body.find('> tr[data-index]').off('hover').hover(function () { - var index = $(this).data('index'); - that.$fixedBody.find('tr[data-index="' + index + '"]').addClass('hover'); - }, function () { - var index = $(this).data('index'); - that.$fixedBody.find('tr[data-index="' + index + '"]').removeClass('hover'); - }); - this.$fixedBody.find('tr[data-index]').off('hover').hover(function () { - var index = $(this).data('index'); - that.$body.find('tr[data-index="' + index + '"]').addClass('hover'); - }, function () { - var index = $(this).data('index'); - that.$body.find('> tr[data-index="' + index + '"]').removeClass('hover'); - }); + this.$rightfixedBody.css({ + width: this.$rightfixedHeader.width(), + height: height - 13, + //top: top + 1 + }).show(); + + + this.$body.find('> tr').each(function (i) { + that.$rightfixedBody.find('tbody tr:eq(' + i + ')').height($(this).height()); + }); + + //// events + this.$tableBody.on('scroll', function () { + that.$rightfixedBody.find('table').css('top', -$(this).scrollTop()); + }); + this.$body.find('> tr[data-index]').off('hover').hover(function () { + var index = $(this).data('index'); + that.$rightfixedBody.find('tr[data-index="' + index + '"]').addClass('hover'); + }, function () { + var index = $(this).data('index'); + that.$rightfixedBody.find('tr[data-index="' + index + '"]').removeClass('hover'); + }); + this.$rightfixedBody.find('tr[data-index]').off('hover').hover(function () { + var index = $(this).data('index'); + that.$body.find('tr[data-index="' + index + '"]').addClass('hover'); + }, function () { + var index = $(this).data('index'); + that.$body.find('> tr[data-index="' + index + '"]').removeClass('hover'); + }); + } }; })(jQuery); + diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js index 5157eeb2..77d32f1c 100644 --- a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js +++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js @@ -129,9 +129,9 @@ var table = { onPostBody: options.onPostBody, // 渲染完成后执行的事件 maintainSelected: options.maintainSelected, // 前端翻页时保留所选行 rememberSelected: options.rememberSelected, // 启用翻页记住前面的选择 - fixedColumns: true, // 是否启用冻结列（左侧） - fixedNumber: 0, // 列冻结的个数（左侧） - fixedRightNumber: 5, // 列冻结的个数（右侧） + fixedColumns: options.fixedColumns, // 是否启用冻结列（左侧） + fixedNumber: options.fixedRightNumber, // 列冻结的个数（左侧） + fixedRightNumber: options.fixedRightNumber, // 列冻结的个数（右侧） onReorderRow: options.onReorderRow, // 当拖拽结束后处理函数 queryParams: options.queryParams, // 传递参数（*） rowStyle: options.rowStyle, // 通过自定义函数设置行样式 diff --git a/ruoyi-admin/src/main/resources/templates/erp/bom/add.html b/ruoyi-admin/src/main/resources/templates/erp/bom/add.html index c18a2110..e717c976 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/bom/add.html +++ b/ruoyi-admin/src/main/resources/templates/erp/bom/add.html @@ -10,6 +10,7 @@
+
@@ -27,35 +28,35 @@
- - + --> +
- - + --> +
- - + --> +
@@ -145,9 +146,9 @@ $("input[name='materialName']").val(data.materialName); $("input[name='brand']").val(data.brand); $("textarea[name='describe']").val(data.describe); - $("input[name='materialType']").val(data.materialType); - $("input[name='processMethod']").val([data.processMethod]).trigger("change"); - $("input[name='unit']").val([data.unit]).trigger("change"); + $("#selectMaterialType").val([data.materialType]).trigger("change"); + $("#selectProcessMethod").val([data.processMethod]).trigger("change"); + $("#selectUnit").val([data.unit]).trigger("change"); }); var options = { id: 'bootstrap-sub-table-1', @@ -175,17 +176,30 @@ return columnIndex + $.table.serialNumber(index); } }, - /**{ - title: '选择料号', - events: optEvent, - formatter: optFormatter - },*/ { field: 'level', align: 'center', title: '层级', + visible: false, + formatter: function(value, row, index) { + if (value==null){ + value = 1; + } + return $.table.selectCategoryLabel(bomLevelSelectDatas, value); + } + }, + { + field: 'bomNo', + title: '关联bom号', visible: false - + }, + { + field: 'photoUrl', + title: '图片', + visible: false, + formatter: function(value, row, index) { + return $.table.imageView(value); + } }, { field: 'materialNo', @@ -323,17 +337,14 @@ row: { id:rowData.id, bomNo:rowData.bomNo, - level: 1, materialNo: rowData.materialNo, materialName: rowData.materialName, materialType: rowData.materialType, describe: rowData.describe, - brand: rowData.brand, - unit: rowData.unit, processMethod: rowData.processMethod, unit: rowData.unit, brand: rowData.brand, - level: "..1", + level: "1", useNum:'', lossRate:'' } diff --git a/ruoyi-admin/src/main/resources/templates/erp/bom/bom.html b/ruoyi-admin/src/main/resources/templates/erp/bom/bom.html index 54ec6187..7d4a75e4 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/bom/bom.html +++ b/ruoyi-admin/src/main/resources/templates/erp/bom/bom.html @@ -3,6 +3,7 @@ +
@@ -49,6 +50,16 @@ +
  • + + +
    • +
  • + + + - + +
  • @@ -73,7 +84,7 @@ 导出 - + bom对比
    • @@ -84,6 +95,7 @@
    + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/erp/bom/edit.html b/ruoyi-admin/src/main/resources/templates/erp/bom/edit.html index 9e02b23f..8fc3f09d 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/bom/edit.html +++ b/ruoyi-admin/src/main/resources/templates/erp/bom/edit.html @@ -14,48 +14,49 @@
    - +
    - +
    - + --> +
    - +
    - - + --> +
    - - + - --> +
    @@ -105,7 +106,6 @@ $("#treeName").val(body.find('#treeName').val()); layer.close(index); } - var processMethodDatas = [[${@dict.getType('processMethod')}]]; var sysUnitClassDatas = [[${@dict.getType('sys_unit_class')}]]; var materialTypeDatas = [[${@category.getChildByCode('materialType')}]]; @@ -118,7 +118,6 @@ function submitHandler() { if ($.validate.form()) { - var formData = $("#form-bom-edit").serializeArray(); console.log("formData",formData); var tableData = $("#bootstrap-sub-table-1").bootstrapTable('getData'); @@ -185,14 +184,12 @@ $('#selMaterialNo').on('select2:select', function (e) { var data = e.params.data; - $("input[name='materialNo']").val(data.materialNo); $("input[name='materialName']").val(data.materialName); $("input[name='brand']").val(data.brand); $("textarea[name='describe']").val(data.describe); $("#selectMaterialType").val([data.materialType]).trigger("change"); - $("input[name='materialType']").val(data.materialType); - $("input[name='processMethod']").val([data.processMethod]).trigger("change"); - $("input[name='unit']").val([data.unit]).trigger("change"); + $("#selectProcessMethod").val([data.processMethod]).trigger("change"); + $("#selectUnit").val([data.unit]).trigger("change"); }); @@ -353,6 +350,7 @@ id:rowData.subId, materialNo: rowData.materialNo, bomNo: rowData.bomNo, + level:rowData.level, materialName: rowData.materialName, materialType: rowData.materialType, describe: rowData.describe, diff --git a/ruoyi-admin/src/main/resources/templates/erp/bom/equals.html b/ruoyi-admin/src/main/resources/templates/erp/bom/equals.html new file mode 100644 index 00000000..e12b18da --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/erp/bom/equals.html @@ -0,0 +1,143 @@ + + + + + + + + + + +
    + +
    + +
    + +
    +
    +
    + +
    + +
    + +
    + +
    +
    +
    + +
    +
    + +
    +
    +
    + +
    +
    +
    +
    相同项
    +
    +
    + +
    +
    +
    +
    +
    不同项
    +
    +
    + 左列内容 +
    +
    + 右列内容 +
    +
    +
    + + + +
    + + + + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/include.html b/ruoyi-admin/src/main/resources/templates/include.html index 6d5d9340..02c43c09 100644 --- a/ruoyi-admin/src/main/resources/templates/include.html +++ b/ruoyi-admin/src/main/resources/templates/include.html @@ -13,11 +13,10 @@ - - + @@ -36,8 +35,6 @@ - - @@ -51,6 +48,7 @@ +
    @@ -216,10 +214,15 @@
    +
    + +
    + +
    +
    -
    diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html index ca595452..5fb6adc3 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html @@ -2,6 +2,8 @@ + +
    @@ -13,7 +15,7 @@
    + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/makeorder/edit.html b/ruoyi-admin/src/main/resources/templates/system/makeorder/edit.html new file mode 100644 index 00000000..5e69c1c9 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/makeorder/edit.html @@ -0,0 +1,136 @@ + + + + + + +
    +
    + +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/makeorder/makeorder.html b/ruoyi-admin/src/main/resources/templates/system/makeorder/makeorder.html new file mode 100644 index 00000000..6589f9c5 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/makeorder/makeorder.html @@ -0,0 +1,229 @@ + + + + + + +
    +
    +
    +
    +
    +
      +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + + - + +
      • +
    • +  搜索 +  重置 +
      • +
    +
    +
    +
    + + +
    +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/model/add.html b/ruoyi-admin/src/main/resources/templates/system/model/add.html new file mode 100644 index 00000000..9740abad --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/model/add.html @@ -0,0 +1,73 @@ + + + + + + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/model/edit.html b/ruoyi-admin/src/main/resources/templates/system/model/edit.html new file mode 100644 index 00000000..b5398482 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/model/edit.html @@ -0,0 +1,74 @@ + + + + + + +
    +
    + +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/model/model.html b/ruoyi-admin/src/main/resources/templates/system/model/model.html new file mode 100644 index 00000000..bbf76049 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/model/model.html @@ -0,0 +1,161 @@ + + + + + + +
    +
    +
    +
    +
    +
      +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + + - + +
      • +
    • + + +
      • +
    • + + +
      • +
    • +  搜索 +  重置 +
      • +
    +
    +
    +
    + + +
    +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/picking/add.html b/ruoyi-admin/src/main/resources/templates/system/picking/add.html new file mode 100644 index 00000000..d687019f --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/picking/add.html @@ -0,0 +1,79 @@ + + + + + + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/picking/edit.html b/ruoyi-admin/src/main/resources/templates/system/picking/edit.html new file mode 100644 index 00000000..487d9f8a --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/picking/edit.html @@ -0,0 +1,68 @@ + + + + + + +
    +
    + +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/picking/picking.html b/ruoyi-admin/src/main/resources/templates/system/picking/picking.html new file mode 100644 index 00000000..90bbbdd5 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/picking/picking.html @@ -0,0 +1,161 @@ + + + + + + +
    +
    +
    +
    +
    +
      +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + + - + +
      • +
    • + + +
      • +
    • + + +
      • +
    • +  搜索 +  重置 +
      • +
    +
    +
    +
    + + +
    +
    +
    +
    +
    + + + + \ No newline at end of file