Commit 3f3eaba879a2e28676660833ab2c444d36a966b8
1 parent
2c638b36
出库单明细新增最后操作人,用户新增姓名查询
Showing
9 changed files
with
37 additions
and
28 deletions
src/main/java/com/huaheng/api/mes/service/MesServiceImpl.java
... | ... | @@ -128,7 +128,7 @@ public class MesServiceImpl implements IMesService { |
128 | 128 | materialList.add(newMaterial); |
129 | 129 | }else { |
130 | 130 | receiptDetail.setMaterialSpec(material.getSpec()); |
131 | - receiptDetail.setMaterialUnit(material.getUnit()); | |
131 | + //receiptDetail.setMaterialUnit(material.getUnit()); | |
132 | 132 | } |
133 | 133 | receiptDetail.setQty(detail.getQty()); |
134 | 134 | receiptDetail.setIsUrgent(detail.getIsUrgent()); |
... | ... | @@ -226,7 +226,7 @@ public class MesServiceImpl implements IMesService { |
226 | 226 | materialService.save(newMaterial); |
227 | 227 | }else { |
228 | 228 | shipmentDetail.setMaterialSpec(material.getSpec()); |
229 | - shipmentDetail.setMaterialUnit(material.getUnit()); | |
229 | + //shipmentDetail.setMaterialUnit(material.getUnit()); | |
230 | 230 | } |
231 | 231 | shipmentDetail.setMaterialCode(detail.getMaterialCode()); |
232 | 232 | shipmentDetail.setMaterialName(detail.getMaterialName()); |
... | ... | @@ -243,6 +243,7 @@ public class MesServiceImpl implements IMesService { |
243 | 243 | shipmentDetail.setInventorySts("good"); |
244 | 244 | shipmentDetail.setStatus(QuantityConstant.TASK_STATUS_BUILD); |
245 | 245 | shipmentDetail.setCreatedBy("MOM"); |
246 | + shipmentDetail.setLastUpdatedBy("MOM"); | |
246 | 247 | shipmentDetailList.add(shipmentDetail); |
247 | 248 | }); |
248 | 249 | success = shipmentDetailService.saveBatch(shipmentDetailList); |
... | ... | @@ -427,7 +428,6 @@ public class MesServiceImpl implements IMesService { |
427 | 428 | |
428 | 429 | if (StringUtils.isEmpty(shipmentHeader.getRefeCodeType())) { |
429 | 430 | ajaxResult.setCode(RetCode.FAIL).setMsg("单据类型不能为空!!!"); |
430 | - | |
431 | 431 | return true; |
432 | 432 | } else if (StringUtils.isEmpty(shipmentHeader.getReferCode())) { |
433 | 433 | ajaxResult.setCode(RetCode.FAIL).setMsg("单据单号不能为空!!!"); |
... | ... |
src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java
... | ... | @@ -156,6 +156,7 @@ public class ShipmentContainerHeaderServiceImpl extends ServiceImpl<ShipmentCont |
156 | 156 | inventoryDetailService.saveOrUpdate(inventoryDetail); |
157 | 157 | //3.更新单据明细的已出库数量 |
158 | 158 | shipmentDetail.setTaskQty(shipmentDetail.getTaskQty().add(shipmentCombinationModel.getShipQty())); |
159 | + shipmentDetail.setLastUpdatedBy(ShiroUtils.getName()); | |
159 | 160 | int i = shipmentDetail.getQty().compareTo(shipmentDetail.getTaskQty()); |
160 | 161 | if(i > 0){ |
161 | 162 | shipmentDetail.setStatus(QuantityConstant.SHIPMENT_HEADER_WAVE); |
... | ... | @@ -751,6 +752,7 @@ public class ShipmentContainerHeaderServiceImpl extends ServiceImpl<ShipmentCont |
751 | 752 | shipmentDetail.setShipmentId(shipmentHeader.getId()); |
752 | 753 | shipmentDetail.setShipmentCode(shipmentHeader.getCode()); |
753 | 754 | shipmentDetail.setCreatedBy("MOM"); |
755 | + shipmentDetail.setLastUpdatedBy("MOM"); | |
754 | 756 | shipmentDetail.setStatus(QuantityConstant.TASK_STATUS_BUILD); |
755 | 757 | }); |
756 | 758 | headerListData.addAll(headerList); |
... | ... |
src/main/java/com/huaheng/pc/shipment/shipmentHeader/controller/ShipmentHeaderController.java
... | ... | @@ -525,6 +525,7 @@ public class ShipmentHeaderController extends BaseController { |
525 | 525 | shipmentDetail.setShipmentId(shipmentHeader.getId()); |
526 | 526 | shipmentDetail.setShipmentCode(shipmentHeader.getCode()); |
527 | 527 | shipmentDetail.setCreatedBy("MOM"); |
528 | + shipmentDetail.setLastUpdatedBy("MOM"); | |
528 | 529 | shipmentDetail.setStatus(QuantityConstant.TASK_STATUS_BUILD); |
529 | 530 | }); |
530 | 531 | headerListData.addAll(headerList); |
... | ... |
src/main/resources/mybatis/system/UserMapper.xml
... | ... | @@ -24,7 +24,7 @@ |
24 | 24 | <result property="remark" column="remark" /> |
25 | 25 | <association property="dept" column="deptId" resultMap="deptResult" javaType="com.huaheng.pc.system.dept.domain.Dept"/> |
26 | 26 | </resultMap> |
27 | - | |
27 | + | |
28 | 28 | <resultMap id="deptResult" type="com.huaheng.pc.system.dept.domain.Dept"> |
29 | 29 | <id property="id" column="deptId" /> |
30 | 30 | <result property="parentId" column="parentId" /> |
... | ... | @@ -32,7 +32,7 @@ |
32 | 32 | <result property="orderNum" column="orderNum" /> |
33 | 33 | <result property="enable" column="dept_enable" /> |
34 | 34 | </resultMap> |
35 | - | |
35 | + | |
36 | 36 | <sql id="selectUserVo"> |
37 | 37 | select u.id, u.deptId, u.loginName, u.userName, u.email, u.phoneNumber, u.sex, u.avatar, u.password, u.salt, u.enable, u.deleted, u.loginIp, u.loginDate, u.createTime, u.remark, |
38 | 38 | d.id AS deptId, d.parentId, d.deptName, d.orderNum, d.enable as dept_enable |
... | ... | @@ -40,7 +40,7 @@ |
40 | 40 | left join sys_dept d on u.deptId = d.id |
41 | 41 | left join sys_user_role ur on u.id = ur.userId |
42 | 42 | </sql> |
43 | - | |
43 | + | |
44 | 44 | <select id="selectUserList" resultMap="UserResult"> |
45 | 45 | select u.id, u.deptId, u.loginName, u.userName, u.email, u.phoneNumber, u.password, u.sex, u.avatar, u.salt, u.enable, u.deleted, |
46 | 46 | u.loginIp, u.loginDate, u.createBy, u.createTime, u.updateTime, u.updateBy, u.remark, d.deptName |
... | ... | @@ -53,6 +53,9 @@ |
53 | 53 | <if test="userName != null and userName != ''"> |
54 | 54 | AND u.userName like concat('%', #{userName}, '%') |
55 | 55 | </if> |
56 | + <if test="email != null and email != ''"> | |
57 | + AND u.email like concat('%', #{email}, '%') | |
58 | + </if> | |
56 | 59 | <if test="enable != null"> |
57 | 60 | AND u.enable = #{enable} |
58 | 61 | </if> |
... | ... | @@ -69,35 +72,35 @@ |
69 | 72 | AND (u.deptId = #{deptId} OR u.deptId IN ( SELECT t.id FROM sys_dept t WHERE FIND_IN_SET (#{deptId},ancestors) )) |
70 | 73 | </if> |
71 | 74 | </select> |
72 | - | |
75 | + | |
73 | 76 | <select id="selectUserByLoginName" resultMap="UserResult"> |
74 | 77 | <include refid="selectUserVo"/> |
75 | 78 | where u.loginName = #{userName} |
76 | 79 | </select> |
77 | 80 | |
78 | - | |
81 | + | |
79 | 82 | <select id="selectUserByPhoneNumber" resultMap="UserResult"> |
80 | 83 | <include refid="selectUserVo"/> |
81 | 84 | where u.phoneNumber = #{phoneNumber} |
82 | 85 | </select> |
83 | - | |
86 | + | |
84 | 87 | <select id="selectUserByEmail" resultMap="UserResult"> |
85 | 88 | <include refid="selectUserVo"/> |
86 | 89 | where u.email = #{email} |
87 | 90 | </select> |
88 | - | |
91 | + | |
89 | 92 | <select id="checkLoginNameUnique" resultType="java.lang.Integer"> |
90 | 93 | select count(1) from sys_user where loginName=#{loginName} |
91 | 94 | </select> |
92 | - | |
95 | + | |
93 | 96 | <select id="checkPhoneUnique" resultMap="UserResult"> |
94 | 97 | select id, phoneNumber from sys_user where phoneNumber=#{phoneNumber} |
95 | 98 | </select> |
96 | - | |
99 | + | |
97 | 100 | <select id="checkEmailUnique" resultMap="UserResult"> |
98 | 101 | select id, email from sys_user where email=#{email} |
99 | 102 | </select> |
100 | - | |
103 | + | |
101 | 104 | <select id="selectUserById" resultMap="UserResult"> |
102 | 105 | <include refid="selectUserVo"/> |
103 | 106 | where u.id = #{id} |
... | ... | @@ -107,18 +110,18 @@ |
107 | 110 | select id, deptId, loginName, userName, email, phoneNumber, password, sex, avatar, salt, enable, deleted, |
108 | 111 | loginIp, loginDate, createBy, createTime, updateTime, updateBy, remark from sys_user where loginName = #{loginName} |
109 | 112 | </select> |
110 | - | |
113 | + | |
111 | 114 | <delete id="deleteUserById"> |
112 | 115 | delete from sys_user where id = #{id} |
113 | 116 | </delete> |
114 | - | |
117 | + | |
115 | 118 | <delete id="deleteUserByIds"> |
116 | 119 | update sys_user set deleted = true where id in |
117 | 120 | <foreach collection="array" item="id" open="(" separator="," close=")"> |
118 | 121 | #{id} |
119 | - </foreach> | |
122 | + </foreach> | |
120 | 123 | </delete> |
121 | - | |
124 | + | |
122 | 125 | <update id="updateUser"> |
123 | 126 | update sys_user |
124 | 127 | <set> |
... | ... | @@ -148,7 +151,7 @@ |
148 | 151 | </where> |
149 | 152 | </update> |
150 | 153 | <!--where id = #{id}--> |
151 | - | |
154 | + | |
152 | 155 | <insert id="insertUser" useGeneratedKeys="true" keyProperty="id"> |
153 | 156 | insert into sys_user( |
154 | 157 | <if test="deptId != null and deptId != 0">deptId,</if> |
... | ... | @@ -201,7 +204,7 @@ |
201 | 204 | LEFT JOIN warehouse r ON ur.warehouseCode = r.code |
202 | 205 | WHERE u.loginName=#{loginName,jdbcType=VARCHAR} AND r.deleted = FALSE |
203 | 206 | </select> |
204 | - | |
207 | + | |
205 | 208 | <update id="insertupdateTime" > |
206 | 209 | update sys_user set updateTime = #{date} where loginName = #{cPersonCode} |
207 | 210 | </update> |
... | ... | @@ -212,5 +215,5 @@ |
212 | 215 | LEFT JOIN warehouse r ON ur.warehouseCode = r.code |
213 | 216 | WHERE u.loginName=#{loginName,jdbcType=VARCHAR} AND r.`code` =#{warehouseCode,jdbcType=VARCHAR} |
214 | 217 | </select> |
215 | - | |
216 | -</mapper> | |
217 | 218 | \ No newline at end of file |
219 | + | |
220 | +</mapper> | |
... | ... |
src/main/resources/templates/config/container/container.html
... | ... | @@ -180,14 +180,14 @@ |
180 | 180 | field : 'createdBy', |
181 | 181 | title : '创建用户' |
182 | 182 | }, |
183 | - /*{ | |
183 | + { | |
184 | 184 | field : 'lastUpdated', |
185 | 185 | title : '更新时间' |
186 | 186 | }, |
187 | 187 | { |
188 | 188 | field : 'lastUpdatedBy', |
189 | 189 | title : '最后更新人' |
190 | - },*/ | |
190 | + }, | |
191 | 191 | // { |
192 | 192 | // field : 'enable', |
193 | 193 | // title : '是否有效' , |
... | ... |
src/main/resources/templates/index.html
... | ... | @@ -46,7 +46,7 @@ |
46 | 46 | </span> |
47 | 47 | <a href="#" class="dropdown-toggle" data-toggle="dropdown"> |
48 | 48 | <span class="pull-left clear"> |
49 | - <span class="block m-t-xs"><strong class="font-bold">[[${user.userName}]]</strong></span> | |
49 | + <span class="block m-t-xs"><strong class="font-bold">[[${user.email}]]</strong></span> | |
50 | 50 | <span class="text-muted text-xs block"><span th:if="${not #strings.isEmpty(user.dept)}">[[${user.dept.deptName}]]</span> |
51 | 51 | <b class="caret"></b> |
52 | 52 | </span> |
... | ... |
src/main/resources/templates/inventory/cyclecountDetail/add.html
... | ... | @@ -70,7 +70,7 @@ |
70 | 70 | sortOrder: "desc", |
71 | 71 | pagination: false, //取消分页 |
72 | 72 | search: false, |
73 | - height:610, | |
73 | + // height:610, | |
74 | 74 | showSearch: false, |
75 | 75 | showRefresh: false, |
76 | 76 | showToggle: false, |
... | ... | @@ -476,4 +476,4 @@ |
476 | 476 | </script> |
477 | 477 | |
478 | 478 | </body> |
479 | -</html> | |
480 | 479 | \ No newline at end of file |
480 | +</html> | |
... | ... |
src/main/resources/templates/shipment/shipmentHeader/shipmentHeader.html
src/main/resources/templates/system/user/user.html
... | ... | @@ -48,6 +48,9 @@ |
48 | 48 | 用户名称:<input type="text" name="userName"/> |
49 | 49 | </li> |
50 | 50 | <li> |
51 | + 姓名:<input type="text" name="email"/> | |
52 | + </li> | |
53 | + <li> | |
51 | 54 | 手机号码:<input type="text" name="phoneNumber"/> |
52 | 55 | </li> |
53 | 56 | <li> |
... | ... | @@ -68,7 +71,7 @@ |
68 | 71 | class="fa fa-search"></i> 搜索</a> |
69 | 72 | <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset('user-form')"><i |
70 | 73 | class="fa fa-refresh"></i> 重置</a> |
71 | - <!--<a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="system:user:export"><i class="fa fa-download"></i> 导出</a>--> | |
74 | + <a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="system:user:export"><i class="fa fa-download"></i> 导出</a> | |
72 | 75 | </li> |
73 | 76 | </ul> |
74 | 77 | </div> |
... | ... |