| src/main/java/com/zy/asrs/controller/MatCodeController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/entity/MatCode.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/application.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/webapp/static/js/common.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/webapp/views/matCode/matCode_detail.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/controller/MatCodeController.java
@@ -23,6 +23,7 @@ import com.zy.common.utils.excel.matcode.MatCodeExcel; import com.zy.common.utils.excel.matcode.MatCodeExcelListener; import com.zy.common.web.BaseController; import com.zy.system.entity.Role; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; @@ -228,4 +229,24 @@ return R.ok(); } @RequestMapping("/matType/auth") public R type(){ List<Map<String, Object>> result = new ArrayList<>(); for (int i = 1; i < 4; i++) { Map<String, Object> item = new HashMap<>(); item.put("id",i+""); if (i == 1){ item.put("value","原材料"); } if (i == 2){ item.put("value","成品"); } if (i == 3){ item.put("value","半成品"); } result.add(item); } return R.ok(result); } } src/main/java/com/zy/asrs/entity/MatCode.java
@@ -9,11 +9,13 @@ import com.zy.system.entity.User; import com.zy.system.service.UserService; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.Date; @Data @TableName("bas_mat_code") public class MatCode implements Serializable { @@ -70,23 +72,41 @@ @ApiModelProperty(value= "单重") private Double weight; /** * 物料单位 */ @ApiModelProperty(value= "") private String str1; /** * 物料规格 */ @ApiModelProperty(value= "") private String str2; /** * 客户名称 */ @ApiModelProperty(value= "") private String str3; /** * 项目信息 */ @ApiModelProperty(value= "") private String str4; /** * 类别{1:原材料,2:成品,3:半成品} */ @ApiModelProperty(value= "") private String str5; /** * 数量 */ @ApiModelProperty(value= "") private String str6; private Double str6; @ApiModelProperty(value= "") private String str7; @@ -151,36 +171,7 @@ public MatCode() {} public MatCode(String barcode,String matName,String specs,String unit,String size,String color,Double weight,String str1,String str2,String str3,String str4,String str5,String str6,String str7,String str8,String str9,String str10,Double num1,Double num2,Double num3,Double num4,Double num5,Date date1,Long appeUser,Date appeTime,Long modiUser,Date modiTime,Short status) { this.barcode = barcode; this.matName = matName; this.specs = specs; this.unit = unit; this.size = size; this.color = color; this.weight = weight; this.str1 = str1; this.str2 = str2; this.str3 = str3; this.str4 = str4; this.str5 = str5; this.str6 = str6; this.str7 = str7; this.str8 = str8; this.str9 = str9; this.str10 = str10; this.num1 = num1; this.num2 = num2; this.num3 = num3; this.num4 = num4; this.num5 = num5; this.date1 = date1; this.appeUser = appeUser; this.appeTime = appeTime; this.modiUser = modiUser; this.modiTime = modiTime; this.status = status; } // MatCode matCode = new MatCode( // null, // 条码 @@ -306,13 +297,6 @@ this.str5 = str5; } public String getStr6() { return str6; } public void setStr6(String str6) { this.str6 = str6; } public String getStr7() { return str7; src/main/resources/application.yml
@@ -19,9 +19,9 @@ #url: jdbc:sqlserver://192.168.3.99:1433;databasename=gdasrs #username: sa #password: eisoft url: jdbc:sqlserver://localhost:1433;databasename=sxjzasrs url: jdbc:sqlserver://47.97.1.152:51433;databasename=sxjzasrs username: sa password: sa@123 password: Zoneyung@zy56$ mvc: static-path-pattern: /** redis: src/main/webapp/static/js/common.js
@@ -174,6 +174,11 @@ // ,{field: 'num1', align: 'center',title: '数量'} ,{field: 'size', align: 'center',title: '尺寸', hide: true} ,{field: 'color', align: 'center',title: '颜色'} ,{field: 'weight', align: 'center', title: '单重'} ,{field: 'str3', align: 'center', title: '客户名称'} ,{field: 'str4', align: 'center', title: '项目信息'} ,{field: 'str5$', align: 'center', title: '类别'} ,{field: 'str6', align: 'center', title: '数量'} ]
@@ -24,9 +24,9 @@ </div> --> <div class="layui-inline" style="width:31%;"> <label class="layui-form-label">产品编码：</label> <label class="layui-form-label"><span class="not-null">*</span>产品编码：</label> <div class="layui-input-inline"> <input id="matNo" class="layui-input" type="text" onkeyup="check(this.id, 'matCode')" > <input id="matNo" class="layui-input" type="text" onkeyup="check(this.id, 'matCode')" lay-verify="required" > </div> </div> <div class="layui-inline" style="width:31%;display: none"> @@ -68,7 +68,7 @@ <div class="layui-inline" style="width:31%"> <label class="layui-form-label">单重：</label> <div class="layui-input-inline"> <input id="weight" class="layui-input" type="text" lay-verify="number" > <input id="weight" class="layui-input" lay-verify="number" type="number" placeholder="不填为0"> </div> </div> @@ -84,34 +84,46 @@ <input id="str2" class="layui-input" type="text"> </div> </div> <div class="layui-inline" style="width:31%;display: none"> <label class="layui-form-label">：</label> <div class="layui-inline" style="width:31%;"> <label class="layui-form-label">客户名称：</label> <div class="layui-input-inline"> <input id="str3" class="layui-input" type="text"> </div> </div> <div class="layui-inline" style="width:31%;display: none"> <label class="layui-form-label">：</label> <div class="layui-inline" style="width:31%;"> <label class="layui-form-label">项目信息：</label> <div class="layui-input-inline"> <input id="str4" class="layui-input" type="text"> </div> </div> <div class="layui-inline" style="width:31%;display: none"> <label class="layui-form-label">：</label> <!-- <div class="layui-inline" style="width:31%;">--> <!-- <label class="layui-form-label">类别：</label>--> <!-- <div class="layui-input-inline">--> <!-- <input id="str5" class="layui-input" type="text">--> <!-- </div>--> <!-- </div>--> <div class="layui-inline" style="width:31%;"> <label class="layui-form-label">类别：</label> <div class="layui-input-inline cool-auto-complete"> <input id="str5" name="str5" class="layui-input" type="text" style="display: none"> <input id="str5$" name="str5$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="请输入..." onfocus=this.blur()> <div class="cool-auto-complete-window"> <input class="cool-auto-complete-window-input" data-key="matTypeBymatType" onkeyup="autoLoad(this.getAttribute('data-key'))"> <select class="cool-auto-complete-window-select" data-key="matTypeBymatTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple"> </select> </div> </div> </div> <div class="layui-inline" style="width:31%;"> <label class="layui-form-label">数量：</label> <div class="layui-input-inline"> <input id="str5" class="layui-input" type="text"> <input id="str6" class="layui-input" type="number" placeholder="不填为0"> </div> </div> <div class="layui-inline" style="width:31%;display: none"> <label class="layui-form-label">：</label> <div class="layui-input-inline"> <input id="str6" class="layui-input" type="text"> </div> </div> <div class="layui-inline" style="width:31%;display: none"> <label class="layui-form-label">：</label> <div class="layui-input-inline"> <input id="str7" class="layui-input" type="text"> <input id="str7" class="layui-input" type="number" placeholder="不填为0"> </div> </div> <div class="layui-inline" style="width:31%;display: none">
