diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiMaterialOperateController.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiMaterialOperateController.java index d6e9440c5..54a84dee0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiMaterialOperateController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiMaterialOperateController.java @@ -70,11 +70,19 @@ public class BusiMaterialOperateController extends BaseController /** * 新增物料操作流水 */ - @GetMapping("/add") - public String add(@RequestParam(name = "operType",required = false) String operType,ModelMap mmap) + @GetMapping("/addIn") + public String addIn() { - mmap.put("operType",operType); - return prefix + "/add"; + return prefix + "/addIn"; + } + + /** + * 新增物料操作流水 + */ + @GetMapping("/addOut") + public String addOut() + { + return prefix + "/addOut"; } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiProductRequireController.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiProductRequireController.java index bc597c953..bdec7dfcc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiProductRequireController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiProductRequireController.java @@ -1,5 +1,6 @@ package com.ruoyi.busi.controller; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -131,15 +132,61 @@ public class BusiProductRequireController extends BaseController return toAjax(busiProductRequireService.deleteBusiProductRequireByIds(ids)); } + //////////////// + + /** + * 通过订单ID查询 物料类型列表 + */ + @PostMapping("/selMaterialTypeListByOrderId") + @ResponseBody + public AjaxResult selMaterialTypeListByOrderId(@RequestParam(name = "orderId",required = false) String orderId) + { + List> list = busiProductRequireService.selMaterialTypeListByOrderId(orderId); + return success(list); + } + + /** + * 通过订单ID和物料类型查询 物料颜色列表 + */ + @PostMapping("/selMaterialColorListByOrderIdAndType") + @ResponseBody + public AjaxResult selMaterialColorListByOrderIdAndType(@RequestParam Map queryMap) + { + List> list = busiProductRequireService.selMaterialColorListByOrderIdAndType(queryMap); + return success(list); + } /** * 通过订单ID查询产品需求列表 */ @PostMapping("/listByOrderId") @ResponseBody - public AjaxResult list(@RequestParam(name = "orderId",required = false) String orderId) + public AjaxResult listByOrderId(@RequestParam(name = "orderId", required = false) String orderId) { + BusiProductRequire query = new BusiProductRequire(); + query.setOrderId(orderId); + List list = busiProductRequireService.selectBusiProductRequireList(query); + return success(list); + } + + /** + * 通过产品ID查询 物料类型列表 + */ + @PostMapping("/selMaterialTypeListByProductId") + @ResponseBody + public AjaxResult selMaterialTypeListByProductId(@RequestParam(name = "productId",required = false) String productId) { - List> list = busiProductRequireService.selectMaterialRequireByOrderId(orderId); + List> list = busiProductRequireService.selMaterialTypeListByProductId(productId); + return success(list); + } + + /** + * 通过产品ID和查询物料颜色查询物料类型需求列表 + */ + @PostMapping("/materialColorListByProductIdAndType") + @ResponseBody + public AjaxResult selMaterialColorListByProductIdAndType(@RequestParam Map queryMap) + { + List> list = busiProductRequireService.selMaterialColorListByProductIdAndType(queryMap); return success(list); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiMaterialRequire.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiMaterialRequire.java index 43ee8cc55..5b3af962b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiMaterialRequire.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiMaterialRequire.java @@ -5,6 +5,8 @@ import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; +import java.math.BigDecimal; + /** * 物料需求对象 busi_material_require * @@ -24,7 +26,7 @@ public class BusiMaterialRequire extends BaseEntity /** 数量 */ @Excel(name = "数量") - private Long amount; + private BigDecimal amount; /** 单位 */ @Excel(name = "单位") @@ -56,16 +58,16 @@ public class BusiMaterialRequire extends BaseEntity { return productRequireId; } - public void setAmount(Long amount) - { + + public BigDecimal getAmount() { + return amount; + } + + public void setAmount(BigDecimal amount) { this.amount = amount; } - public Long getAmount() - { - return amount; - } - public void setUnit(String unit) + public void setUnit(String unit) { this.unit = unit; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/mapper/BusiProductRequireMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/mapper/BusiProductRequireMapper.java index fe32b1312..655231090 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/busi/mapper/BusiProductRequireMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/mapper/BusiProductRequireMapper.java @@ -87,11 +87,11 @@ public interface BusiProductRequireMapper */ public int deleteBusiMaterialRequireByProductRequireId(String id); - /** - * 通过订单ID查询物料需求列表 - * - * @param orderId 订单ID - * @return 结果 - */ - List> selectMaterialRequireByOrderId(String orderId); + List> selMaterialTypeListByOrderId(String orderId); + + List> selMaterialColorListByOrderIdAndType(Map queryMap); + + List> selMaterialTypeListByProductId(String productId); + + List> selMaterialColorListByProductIdAndType(Map queryMap); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiProductRequireService.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiProductRequireService.java index 70417d0dc..a7bd40a79 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiProductRequireService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiProductRequireService.java @@ -61,11 +61,11 @@ public interface IBusiProductRequireService */ public int deleteBusiProductRequireById(String id); - /** - * 按订单查询物料需求 - * - * @param id 产品需求主键 - * @return 结果 - */ - public List> selectMaterialRequireByOrderId(String orderId); + List> selMaterialTypeListByOrderId(String orderId); + + List> selMaterialColorListByOrderIdAndType(Map queryMap); + + List> selMaterialTypeListByProductId(String productId); + + List> selMaterialColorListByProductIdAndType(Map queryMap); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiProductRequireServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiProductRequireServiceImpl.java index d3e3af5cb..8872d8db9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiProductRequireServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiProductRequireServiceImpl.java @@ -111,8 +111,23 @@ public class BusiProductRequireServiceImpl implements IBusiProductRequireService } @Override - public List> selectMaterialRequireByOrderId(String orderId) { - return busiProductRequireMapper.selectMaterialRequireByOrderId(orderId); + public List> selMaterialTypeListByOrderId(String orderId) { + return busiProductRequireMapper.selMaterialTypeListByOrderId(orderId); + } + + @Override + public List> selMaterialColorListByOrderIdAndType(Map queryMap) { + return busiProductRequireMapper.selMaterialColorListByOrderIdAndType(queryMap); + } + + @Override + public List> selMaterialTypeListByProductId(String productId) { + return busiProductRequireMapper.selMaterialTypeListByProductId(productId); + } + + @Override + public List> selMaterialColorListByProductIdAndType(Map queryMap) { + return busiProductRequireMapper.selMaterialColorListByProductIdAndType(queryMap); } /** diff --git a/ruoyi-admin/src/main/resources/mapper/busi/BusiProductRequireMapper.xml b/ruoyi-admin/src/main/resources/mapper/busi/BusiProductRequireMapper.xml index a17481d4f..1f6620974 100644 --- a/ruoyi-admin/src/main/resources/mapper/busi/BusiProductRequireMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/busi/BusiProductRequireMapper.xml @@ -130,15 +130,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - + SELECT DISTINCT bmr.classify classifyCode + from busi_material_require bmr + LEFT JOIN busi_product_require bpr + on bmr.product_require_id = bpr.id + where bpr.order_id = #{orderId} + + + + \ No newline at end of file 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 05967ff38..1977ef390 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 @@ -525,6 +525,20 @@ var table = { } return distinct ? $.common.uniqueFn(rows) : rows; }, + // 返回数据字典显示值 + getDictText: function(datas, value) { + if ($.common.isEmpty(datas) || $.common.isEmpty(value)) { + return ''; + } + var actions = []; + $.each(datas, function(index, dict) { + if (dict.dictValue == ('' + value)) { + actions.push(dict.dictLabel); + return false; + } + }); + return actions.join(''); + }, // 回显数据字典 selectDictLabel: function(datas, value) { if ($.common.isEmpty(datas) || $.common.isEmpty(value)) { diff --git a/ruoyi-admin/src/main/resources/templates/busi/materialperate/add.html b/ruoyi-admin/src/main/resources/templates/busi/materialperate/add.html index 7bbdb48c7..9901ebcfd 100644 --- a/ruoyi-admin/src/main/resources/templates/busi/materialperate/add.html +++ b/ruoyi-admin/src/main/resources/templates/busi/materialperate/add.html @@ -1,113 +1,134 @@ - + -
-
-
- -
- - -
+
+ +
+ +
+ +
-
- -
- -
- +
+
+ +
+
-
- -
- -
- +
+
-
- -
- -
+ +
+
+ +
+
-
- -
- -
+ +
+
+ +
+
+
+
+ +
+ +
+
-
-
-
- - 保存 - -
-
- - 关闭 - -
- -
- - + /*物料需求颜色查询*/ + function queryColorList(orderId, classify) { + var url = ctx + "busi/productRequire/selMaterialColorListByOrderIdAndType"; + $.operate.ajaxPost(url, { + orderId:orderId, + classify:classify + }, function (result) { + var data = result.data; + $("#color").empty().append(""); + for (var i = 0; i < data.length; i++) { + var val = data[i].colorCode; + var text = data[i].colorText; + $("#color").append(""); + } + }) + } + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/busi/materialperate/addIn.html b/ruoyi-admin/src/main/resources/templates/busi/materialperate/addIn.html new file mode 100644 index 000000000..312c00224 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/busi/materialperate/addIn.html @@ -0,0 +1,141 @@ + + + + + + +
+
+ + +
+ +
+ + +
+
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ +
+ + + + + + + + + +
+ +
+ +
+
+ +
+
+
+ + 保存 + +
+
+ + 关闭 + +
+ +
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/busi/materialperate/addOut.html b/ruoyi-admin/src/main/resources/templates/busi/materialperate/addOut.html new file mode 100644 index 000000000..f4c7a7141 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/busi/materialperate/addOut.html @@ -0,0 +1,154 @@ + + + + + + +
+
+ +
+ +
+ + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+
+
+ +
+ +
+ +
+
+ +
+ +
+
+ +
+
+
+ + 保存 + +
+
+ + 关闭 + +
+ +
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/busi/materialperate/materialperate.html b/ruoyi-admin/src/main/resources/templates/busi/materialperate/materialperate.html index 96f457c77..4d9cbb1ea 100644 --- a/ruoyi-admin/src/main/resources/templates/busi/materialperate/materialperate.html +++ b/ruoyi-admin/src/main/resources/templates/busi/materialperate/materialperate.html @@ -43,8 +43,11 @@
- - 添加 + + 添加来料 + + + 添加分料 @@ -169,6 +172,14 @@ }; $.modal.openOptions(options); } + + function addIn(){ + $.modal.open("添加来料", prefix + "/addIn"); + } + + function addOut(){ + $.modal.open("添加分料", prefix + "/addOut"); + } \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/busi/productRequire/add.html b/ruoyi-admin/src/main/resources/templates/busi/productRequire/add.html index 7df4a29c9..0ea9d5d0b 100644 --- a/ruoyi-admin/src/main/resources/templates/busi/productRequire/add.html +++ b/ruoyi-admin/src/main/resources/templates/busi/productRequire/add.html @@ -46,7 +46,7 @@
-

物料需求信息

+

单件产品物料需求

@@ -130,7 +130,7 @@ align: 'center', title: '数量', formatter: function(value, row, index) { - var html = $.common.sprintf("", index, value); + var html = $.common.sprintf("", index, value); return html; } }, diff --git a/ruoyi-admin/src/main/resources/templates/busi/productRequire/edit.html b/ruoyi-admin/src/main/resources/templates/busi/productRequire/edit.html index c8daf976e..67d9f5d14 100644 --- a/ruoyi-admin/src/main/resources/templates/busi/productRequire/edit.html +++ b/ruoyi-admin/src/main/resources/templates/busi/productRequire/edit.html @@ -47,7 +47,7 @@
-

物料需求信息

+

单件产品物料需求

@@ -132,7 +132,7 @@ align: 'center', title: '数量', formatter: function(value, row, index) { - var html = $.common.sprintf("", index, value); + var html = $.common.sprintf("", index, value); return html; } },