diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsStandardController.java b/ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsStandardController.java index 2940d218..363a2a0b 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsStandardController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsStandardController.java @@ -5,7 +5,10 @@ import com.ghy.common.core.domain.AjaxResult; import com.ghy.common.core.page.TableDataInfo; import com.ghy.goods.domain.GoodsStandard; import com.ghy.goods.service.GoodsStandardService; +import com.ghy.order.domain.OrderTemplate; +import com.ghy.order.service.OrderTemplateService; 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.*; @@ -22,11 +25,20 @@ public class GoodsStandardController extends BaseController { @Resource private GoodsStandardService goodsStandardService; + @Autowired + private OrderTemplateService orderTemplateService; @GetMapping("/addTemplate") public String addTemplate(ModelMap modelMap){ return PREFIX + "/addTemplate"; } + + @GetMapping("getByTemplateId/{id}") + public String getByTemplateId(ModelMap modelMap, @PathVariable("id") Long templateId) { + OrderTemplate orderTemplate = orderTemplateService.selectById(templateId); + modelMap.put("template", orderTemplate); + return PREFIX + "/addTemplate"; + } @RequiresPermissions("goods:standard:view") @GetMapping public String goodsStandard(Long goodsId, ModelMap mmap) { diff --git a/ghy-admin/src/main/resources/templates/goods/standard/addTemplate.html b/ghy-admin/src/main/resources/templates/goods/standard/addTemplate.html index 91f0cb5a..ccfb03e3 100644 --- a/ghy-admin/src/main/resources/templates/goods/standard/addTemplate.html +++ b/ghy-admin/src/main/resources/templates/goods/standard/addTemplate.html @@ -2,22 +2,91 @@ + + + + -
+
+
商品信息
-
+
-

MR1234

-

快速发布

+
MR1234
+
快速发布
- +
@@ -41,46 +110,364 @@
-
- + +
+
+ +
+
+ +
+
+ +
- + +
+ +
+
+ + +
+
+
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+
+ +
+
+
+ +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+
+ +
+ +
+
+ +
+
+ +
+
+ +
+
+
+ +
+ +
+ +
+
+
+ +
+
+
+ +
+
+
+ +
+ + + + + + +
+
+
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+
+
+
需提供可搬货人员，楼层
+
+
层（费用另行计算）；
+
+
+
+
+
+
+
+
+
+
+ 合计金额： + ¥ + 0 +
+
+
+
+ +
+
+
+ +
+
+ +
+
+
+
+
+ + +