root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2022-11-18 16:44:14 +08:00
parent 79352b092d 0bfc835393
commit fdb29c788a
23 changed files with 413 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lms/nladmin-system/src/main/java/org/nl/modules/security/rest/AuthorizationController.java
View File

@@ -92,6 +92,9 @@ public class AuthorizationController {
throw new BadRequestException("账号或密码错误");
}
// 判断是否被锁
if (!userDto.getEnabled()) throw new BadRequestException("账号未激活");
// 获取权限列表 - 登录查找权限
List<String> permissionList = roleService.getPermissionList(userDto);

6
lms/nladmin-system/src/main/java/org/nl/modules/system/rest/UserController.java
View File

@@ -19,6 +19,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.dev33.satoken.secure.SaSecureUtil;
import cn.dev33.satoken.stp.StpUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.ObjectUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
@@ -109,7 +110,10 @@ public class UserController {
public ResponseEntity<Object> create(@Validated @RequestBody User resources){
checkLevel(resources);
// 默认密码 123456
resources.setPassword(SaSecureUtil.md5BySalt("123456", "salt"));
if (ObjectUtil.isEmpty(resources.getPassword()))
resources.setPassword(SaSecureUtil.md5BySalt("123456", "salt"));
else
resources.setPassword(SaSecureUtil.md5BySalt(resources.getPassword(), "salt"));
userService.create(resources);
return new ResponseEntity<>(HttpStatus.CREATED);
}

57
lms/nladmin-system/src/main/java/org/nl/modules/system/service/impl/UserServiceImpl.java
View File

@@ -15,6 +15,8 @@
*/
package org.nl.modules.system.service.impl;
import cn.dev33.satoken.secure.SaSecureUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import lombok.RequiredArgsConstructor;
import org.nl.modules.common.config.FileProperties;
@@ -89,9 +91,6 @@ public class UserServiceImpl implements UserService {
if (userRepository.findByUsername(resources.getUsername()) != null) {
throw new EntityExistException(User.class, "username", resources.getUsername());
}
if (userRepository.findByEmail(resources.getEmail()) != null) {
throw new EntityExistException(User.class, "email", resources.getEmail());
}
resources.setCreateBy(SecurityUtils.getCurrentUsername());
userRepository.save(resources);
}
@@ -102,45 +101,37 @@ public class UserServiceImpl implements UserService {
User user = userRepository.findById(resources.getId()).orElseGet(User::new);
ValidationUtil.isNull(user.getId(), "User", "id", resources.getId());
User user1 = userRepository.findByUsername(resources.getUsername());
User user2 = userRepository.findByEmail(resources.getEmail());
if (user1 != null && !user.getId().equals(user1.getId())) {
throw new EntityExistException(User.class, "username", resources.getUsername());
}
if (user2 != null && !user.getId().equals(user2.getId())) {
throw new EntityExistException(User.class, "email", resources.getEmail());
}
// 如果用户的角色改变
if (!resources.getRoles().equals(user.getRoles())) {
redisUtils.del(CacheKey.DATA_USER + resources.getId());
redisUtils.del(CacheKey.MENU_USER + resources.getId());
redisUtils.del(CacheKey.ROLE_AUTH + resources.getId());
}
// 如果用户名称修改
if(!resources.getUsername().equals(user.getUsername())){
redisUtils.del("user::username:" + user.getUsername());
}
// 如果用户名称或者状态修改
redisUtils.del("user::username:" + user.getUsername());
// 如果用户被禁用，则清除用户登录信息
if(!resources.getEnabled()){
onlineUserService.kickOutForUsername(resources.getUsername());
}
User clone = new User(); // jpa 多表问题，需要用新的类来进行修改
clone.setId(resources.getId());
clone.setUsername(resources.getUsername());
clone.setEmail(resources.getEmail());
clone.setEnabled(resources.getEnabled());
clone.setRoles(resources.getRoles());
clone.setDept(resources.getDept());
clone.setPhone(resources.getPhone());
clone.setNickName(resources.getNickName());
clone.setGender(resources.getGender());
user.setId(resources.getId());
user.setUsername(resources.getUsername());
user.setEmail(resources.getEmail());
user.setEnabled(resources.getEnabled());
user.setRoles(resources.getRoles());
user.setDept(resources.getDept());
user.setPhone(resources.getPhone());
user.setNickName(resources.getNickName());
user.setGender(resources.getGender());
if (ObjectUtil.isNotEmpty(resources.getPassword()))
user.setPassword(SaSecureUtil.md5BySalt(resources.getPassword(), "salt"));
userRepository.save(clone);
userRepository.save(user);
// 清除缓存
delCaches(user.getId(), user.getUsername());
// 修改session
// flushSession(user);
}
@Override
@@ -153,8 +144,6 @@ public class UserServiceImpl implements UserService {
userRepository.save(user);
// 清理缓存
delCaches(user.getId(), user.getUsername());
// 修改session
// flushSession(user);
}
@Override
@@ -184,7 +173,6 @@ public class UserServiceImpl implements UserService {
public void updatePass(String username, String pass) {
userRepository.updatePass(username, pass, new Date());
redisUtils.del("user::username:" + username);
// flushSession(userRepository.findByUsername(username));
}
@Override
@@ -200,7 +188,6 @@ public class UserServiceImpl implements UserService {
FileUtil.del(oldPath);
}
@NotBlank String username = user.getUsername();
// flushSession(user);
return new HashMap<String, String>(1) {{
put("avatar", file.getName());
}};
@@ -210,7 +197,6 @@ public class UserServiceImpl implements UserService {
@Transactional(rollbackFor = Exception.class)
public void updateEmail(String username, String email) {
userRepository.updateEmail(username, email);
// flushSession(userRepository.findByUsername(username));
}
@Override
@@ -239,17 +225,6 @@ public class UserServiceImpl implements UserService {
*/
public void delCaches(Long id, String username) {
redisUtils.del(CacheKey.USER_ID + id);
// flushCache(username);
}
/**
* 清理 登陆时 用户缓存信息
*
* @param user /
*/
// private void flushSession(User user) {
// UserDto userDto = this.findByName(user.getUsername());
// List<String> permissionList = roleService.getPermissionList(userDto.getId().toString());
// flushSessionUtil.flushSessionInfo(userDto, permissionList);
// }
}

24
lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/PdaCheckServiceImpl.java
View File

@@ -63,11 +63,18 @@ public class PdaCheckServiceImpl implements PdaCheckService {
//明细表
WQLObject wo_dtl = WQLObject.getWQLObject("ST_IVT_CheckDtl");
JSONObject jsonMst = wo_mst.query("check_code = '" + whereJson.getString("check_code") + "'").uniqueResult(0);
JSONArray dtlArr = wo_dtl.query("check_code = '" + whereJson.getString("check_code") + "'").getResultJSONArray(0);
JSONArray dtlArr = new JSONArray();
JSONArray check_rows = whereJson.getJSONArray("check_rows");
for (int i = 0; i < check_rows.size(); i++) {
JSONObject json = check_rows.getJSONObject(i);
JSONObject jsonObject = wo_dtl.query("checkdtl_id = '" + json.getString("checkdtl_id") + "'").uniqueResult(0);
jsonObject.put("fac_qty",json.getString("fac_qty"));
dtlArr.add(jsonObject);
}
JSONObject jsonMst = wo_mst.query("check_code = '" + whereJson.getString("check_code") + "'").uniqueResult(0);
JSONObject param = new JSONObject();
param.put("form",jsonMst);
param.put("row",jsonMst);
param.put("rows",dtlArr);
checkService.saveCheck(param);
@@ -83,12 +90,19 @@ public class PdaCheckServiceImpl implements PdaCheckService {
WQLObject wo_mst = WQLObject.getWQLObject("ST_IVT_CheckMst");
//明细表
WQLObject wo_dtl = WQLObject.getWQLObject("ST_IVT_CheckDtl");
JSONArray dtlArr = new JSONArray();
JSONArray check_rows = whereJson.getJSONArray("check_rows");
for (int i = 0; i < check_rows.size(); i++) {
JSONObject json = check_rows.getJSONObject(i);
JSONObject jsonObject = wo_dtl.query("checkdtl_id = '" + json.getString("checkdtl_id") + "'").uniqueResult(0);
jsonObject.put("fac_qty",json.getString("fac_qty"));
dtlArr.add(jsonObject);
}
JSONObject jsonMst = wo_mst.query("check_code = '" + whereJson.getString("check_code") + "'").uniqueResult(0);
JSONArray dtlArr = wo_dtl.query("check_code = '" + whereJson.getString("check_code") + "'").getResultJSONArray(0);
JSONObject param = new JSONObject();
param.put("form",jsonMst);
param.put("row",jsonMst);
param.put("rows",dtlArr);
checkService.confirm(param);

2
lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/VirtualOutServiceImpl.java
View File

@@ -49,7 +49,7 @@ public class VirtualOutServiceImpl implements VirtualOutService {
JSONArray resultJSONArray = WQL.getWO("PDA_VIRTUALOUT").addParam("flag", "3").process().getResultJSONArray(0);
JSONObject jo = new JSONObject();
jo.put("rows", resultJSONArray);
jo.put("data", resultJSONArray);
jo.put("message", "查询成功!");
return jo;
}

6
lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_CHECK.wql
View File

@@ -67,7 +67,7 @@
WHEN '0' THEN '正常'
WHEN '1' THEN '异常'
END
) AS status,
) AS is_nok,
input_optname,
input_time,
confirm_optname,
@@ -108,8 +108,8 @@
dtl.storagevehicle_code,
mater.material_code,
mater.material_name,
dtl.base_qty,
dtl.fac_qty,
ROUND(dtl.base_qty) AS base_qty,
ROUND(dtl.fac_qty) AS fac_qty,
dtl.qty_unit_name,
(
CASE

2
lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_VIRTUALOUT.wql
View File

@@ -138,7 +138,7 @@
IF 输入.flag = "3"
QUERY
SELECT
label,
label AS text,
value
FROM
sys_dict_detail

39
lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
View File

@@ -260,6 +260,8 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
jsonDtl.put("source_bill_code", row.getString("source_bill_code"));
jsonDtl.put("assign_qty", "0");
jsonDtl.put("unassign_qty", row.get("plan_qty"));
jsonDtl.put("vbeln", row.getString("vbeln"));
jsonDtl.put("posnr", row.getString("posnr"));
WQLObject.getWQLObject("ST_IVT_IOStorInvDtl").insert(jsonDtl);
qty += jsonDtl.getDoubleValue("plan_qty");
@@ -1351,6 +1353,8 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
.addParam("iostorinv_id", map.get("iostorinv_id"))
.addParam("stor_id", map.get("stor_id"))
.addParam("sect_id", map.get("sect_id"))
.addParam("remark", map.get("remark"))
.addParam("sale_order_name", map.get("source_bill_code"))
.process()
.getResultJSONArray(0);
return jo;
@@ -1677,7 +1681,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
}
JSONObject jsonSub = subTab.query("container_name = '" + json2.getString("pcsn") + "'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(jsonSect)) {
if (ObjectUtil.isNotEmpty(jsonSub)) {
jsonDis.put("CHARG", jsonSub.getString("sap_pcsn")); // sap批次
}
jsonDis.put("VBELN", json.getString("vbeln")); // 交货
@@ -1734,10 +1738,14 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
JSONObject paramMst = new JSONObject();
JSONArray paramArr = new JSONArray();
paramMst.put("BLDAT", jo_mst.getString("biz_date"));
paramMst.put("BUDAT", jo_mst.getString("biz_date"));
paramMst.put("BKTXT", ""); // 凭证抬头文本
paramMst.put("XBLNR", ""); // 参考
// 去除日期中的横杠、冒号、空格
String biz_date = jo_mst.getString("biz_date");
String response = biz_date.replaceAll("[[\\s-:punct:]]","");
paramMst.put("BLDAT", response); // 去掉-
paramMst.put("BUDAT", response); // 去掉-
paramMst.put("BKTXT", jo_mst.getString("bill_code")); // 凭证抬头文本: 出库主表单据号
paramMst.put("XBLNR", jo_mst.getString("input_optname")); // 参考：出库单创建人name
JSONArray disArr = wo_dis.query("iostorinv_id = '" + jo_mst.getString("iostorinv_id") + "'").getResultJSONArray(0);
for (int i = 0; i < disArr.size(); i++) {
@@ -1750,12 +1758,25 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
jsonDtl.put("BWART", "311");
jsonDtl.put("MENGE", json.getDoubleValue("plan_qty"));
jsonDtl.put("MEINS", json.getString("qty_unit_id"));
jsonDtl.put("LGORT", ""); // 库存地点
JSONObject jsonSect = sectTab.query("sect_id = '" + json.getString("sect_id") + "'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(jsonSect)) {
jsonDtl.put("LGORT", jsonSect.getString("ext_id")); // 库存地点：库区外部标识
}
JSONObject jsonSub = subTab.query("container_name = '" + json.getString("pcsn") + "'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(jsonSub)) {
String sale_order_name = jsonSub.getString("sale_order_name");
// 销售订单：子卷包装关系 - 前内容
jsonDtl.put("KDAUF", sale_order_name.substring(0, sale_order_name.indexOf("-")));
// 销售订单行项目：子卷包装关系 - 后内容
jsonDtl.put("KDPOS", sale_order_name.substring(sale_order_name.indexOf("-")+1, sale_order_name.length()));
}
jsonDtl.put("CHARG", json.getString("pcsn"));
jsonDtl.put("UMLGO", ""); // 收货库存地点
jsonDtl.put("UMLGO", ""); // 收货库存地点：线边库外部标识
jsonDtl.put("UMCHA", json.getString("pcsn"));
jsonDtl.put("KDAUF", ""); // 销售订单
jsonDtl.put("KDPOS", ""); // 销售订单行项目
paramArr.add(jsonDtl);
}
paramMst.put("item", paramArr);

19
lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql
View File

@@ -42,6 +42,7 @@
输入.task_id TYPEAS s_string
输入.task_status TYPEAS s_string
输入.deptIds TYPEAS f_string
输入.sale_order_name TYPEAS s_string
[临时表]
--这边列出来的临时表就会在运行期动态创建
@@ -161,6 +162,7 @@
LEFT JOIN st_ivt_structattr struct ON struct.struct_id = ivt.struct_id
LEFT JOIN md_me_materialbase mb ON mb.material_id = ivt.material_id
LEFT JOIN SCH_BASE_Point point ON struct.struct_id = point.source_id
LEFT JOIN pdm_bi_subpackagerelation sub ON struct.storagevehicle_code = sub.package_box_sn
WHERE
1 = 1 and struct.lock_type='1'
and struct.struct_id in (
@@ -177,6 +179,9 @@
OPTION 输入.material_id <> ""
ivt.material_id = 输入.material_id
ENDOPTION
OPTION 输入.sale_order_name <> ""
sub.sale_order_name = 输入.sale_order_name
ENDOPTION
OPTION 输入.quality_scode <> ""
ivt.quality_scode = 输入.quality_scode
ENDOPTION
@@ -184,7 +189,7 @@
ivt.pcsn = 输入.pcsn
ENDOPTION
OPTION 输入.remark <> ""
(mb.material_code like 输入.remark or mb.material_name like 输入.remark or struct.storagevehicle_code like 输入.remark)
struct.struct_code like 输入.remark
ENDOPTION
OPTION 输入.ivt_level <> ""
ivt.ivt_level = 输入.ivt_level
@@ -192,9 +197,6 @@
OPTION 输入.is_active <> ""
ivt.is_active = 输入.is_active
ENDOPTION
OPTION 输入.stor_id <> ""
ivt.stor_id = 输入.stor_id
ENDOPTION
OPTION 输入.sect_id <> ""
struct.sect_id = 输入.sect_id
ENDOPTION
@@ -218,11 +220,15 @@
LEFT JOIN st_ivt_structattr struct ON struct.struct_id = ivt2.struct_id
LEFT JOIN md_me_materialbase mb ON mb.material_id = ivt2.material_id
LEFT JOIN SCH_BASE_Point point ON struct.struct_id = point.source_id
LEFT JOIN pdm_bi_subpackagerelation sub ON struct.storagevehicle_code = sub.package_box_sn
WHERE
1 = 1 and struct.lock_type='1'
OPTION 输入.material_id <> ""
ivt2.material_id = 输入.material_id
ENDOPTION
OPTION 输入.sale_order_name <> ""
sub.sale_order_name = 输入.sale_order_name
ENDOPTION
OPTION 输入.quality_scode <> ""
ivt2.quality_scode = 输入.quality_scode
ENDOPTION
@@ -230,7 +236,7 @@
ivt2.pcsn = 输入.pcsn
ENDOPTION
OPTION 输入.remark <> ""
(mb.material_code like 输入.remark or mb.material_name like 输入.remark or struct.storagevehicle_code like 输入.remark)
struct.struct_code like 输入.remark
ENDOPTION
OPTION 输入.ivt_level <> ""
ivt2.ivt_level = 输入.ivt_level
@@ -238,9 +244,6 @@
OPTION 输入.is_active <> ""
ivt2.is_active = 输入.is_active
ENDOPTION
OPTION 输入.stor_id <> ""
ivt2.stor_id = 输入.stor_id
ENDOPTION
OPTION 输入.sect_id <> ""
struct.sect_id = 输入.sect_id
ENDOPTION

2
lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java
View File

@@ -318,7 +318,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
JSONObject param = new JSONObject();
param.put("HEAD", paramSapMstArr);
// System.out.println(param.toString());
System.out.println(param.toString());
// 调用接口回传
new LmsToSapServiceImpl().returnDelivery(param);

BIN
lms/nladmin-ui/src/assets/images/background.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 MiB

After

Width:  |  Height:  |  Size: 128 KiB

47
lms/nladmin-ui/src/views/system/user/index.vue
View File

@@ -80,7 +80,7 @@
<el-form-item label="邮箱" prop="email">
<el-input v-model="form.email" style="width: 200px;" />
</el-form-item>
<el-form-item label="部门" prop="dept.id">
<el-form-item label="部门" prop="dept.id" :rules="[{ required: true, message: '请选择部门', trigger: 'change' }]">
<treeselect
v-model="form.dept.id"
:options="depts"
@@ -89,7 +89,10 @@
placeholder="选择部门"
/>
</el-form-item>
<br v-if="!crud.status.add">
<el-form-item label="密码" prop="password" v-if="crud.status.add">
<el-input v-model="form.password" style="width: 200px;" show-password auto-complete="new-password"/>
</el-form-item>
<el-form-item label="性别">
<el-radio-group v-model="form.gender" style="width: 178px">
<el-radio label="男">男</el-radio>
@@ -168,16 +171,26 @@
<el-table-column
v-permission="['admin','user:edit','user:del']"
label="操作"
width="115"
width="200"
align="center"
fixed="right"
>
<template slot-scope="scope">
<udOperation
style="display: inline"
:data="scope.row"
:permission="permission"
:disabled-dle="scope.row.id === user.id"
/>
<el-button
v-permission="permission.edit"
type="text"
slot="left"
icon="el-icon-refresh-left"
@click="resetPassword(scope.row)"
>
重置密码
</el-button>
</template>
</el-table-column>
</el-table>
@@ -212,7 +225,8 @@ const defaultForm = {
enabled: 'true',
roles: [],
dept: { id: null },
phone: null
phone: null,
password: null
}
export default {
name: 'User',
@@ -256,7 +270,7 @@ export default {
])
},
created() {
this.crud.msg.add = '新增成功，默认密码：123456'
this.crud.msg.add = '新增成功'
},
mounted: function() {
const that = this
@@ -292,6 +306,7 @@ export default {
},
// 新增前将多选的值设置为空
[CRUD.HOOK.beforeToAdd]() {
this.form.password = '123456'
this.roleDatas = []
},
// 初始化编辑时候的角色与岗位
@@ -435,6 +450,28 @@ export default {
},
checkboxT(row, rowIndex) {
return row.id !== this.user.id
},
resetPassword(row) {
row.password = null
this.$prompt('', '重置密码', {
confirmButtonText: '确定',
cancelButtonText: '取消',
inputPlaceholder: '请输入新的密码',
inputPattern: /^[A-Z|a-z|0-9|(._~!@#$^&*)]{6,20}$/,
inputErrorMessage: '密码格式不正确,只能是6-20位密码',
closeOnClickModal: false
}).then(({ value }) => {
row.password = value
crudUser.edit(row).then(res => {
this.crud.toQuery()
this.crud.notify('密码重置成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
})
}).catch(() => {
this.$message({
type: 'info',
message: '取消输入'
})
})
}
}
}

7
lms/nladmin-ui/src/views/wms/st/outbill/StructIvt.vue
View File

@@ -56,7 +56,7 @@
clearable
style="width: 220px"
size="mini"
placeholder="货位编码、名称或载具号"
placeholder="货位编码"
prefix-icon="el-icon-search"
class="filter-item"
/>
@@ -150,9 +150,12 @@ export default {
},
methods: {
open() {
crudSectattr.getSect({ is_materialstore: '1' }).then(res => {
crudSectattr.getSect({ is_productstore: '1' }).then(res => {
debugger
this.sects = res.content
})
this.query.source_bill_code = this.queryrow.source_bill_code
this.query.material_id = this.queryrow.material_id
},
queryStruct() {
this.queryrow.unassign_qty = parseFloat(this.queryrow.unassign_qty) + parseFloat(this.queryrow.assign_qty)