Browse Source

rev:手持修改

master
刘先源 1 week ago
parent
commit
a106e3e700
  1. 2
      wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/service/impl/PdaIosInServiceImpl.java
  2. 2
      wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/StIvtCheckdtlMapper.xml
  3. 2
      wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/RawAssistIStorServiceImpl.java
  4. 2
      wms/nladmin-ui/README.md
  5. 2
      wms/nladmin-ui/src/i18n/langs/zh-CN.js
  6. 2
      wms/nladmin-ui/src/layout/components/Sidebar/Logo.vue

2
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/service/impl/PdaIosInServiceImpl.java

@ -138,7 +138,7 @@ public class PdaIosInServiceImpl implements PdaIosInService {
groupDao.setExt_code(ext_code); groupDao.setExt_code(ext_code);
groupDao.setExt_type(ext_type); groupDao.setExt_type(ext_type);
groupDao.setCreate_id(SecurityUtils.getCurrentUserId()); groupDao.setCreate_id(SecurityUtils.getCurrentUserId());
groupDao.setCreate_name(SecurityUtils.getCurrentUsername()); groupDao.setCreate_name(SecurityUtils.getCurrentNickName());
groupDao.setCreate_time(DateUtil.now()); groupDao.setCreate_time(DateUtil.now());
iMdPbGroupplateService.save(groupDao); iMdPbGroupplateService.save(groupDao);
} }

2
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/StIvtCheckdtlMapper.xml

@ -27,7 +27,7 @@
<select id="getPdaDtl" resultType="com.alibaba.fastjson.JSONObject"> <select id="getPdaDtl" resultType="com.alibaba.fastjson.JSONObject">
SELECT SELECT
dtl.checkdtl_id, dtl.checkdtl_id,
ios.check_code, ios.check_code AS bill_code,
material.material_code, material.material_code,
material.material_name, material.material_name,
dtl.pcsn, dtl.pcsn,

2
wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/RawAssistIStorServiceImpl.java

@ -140,7 +140,7 @@ public class RawAssistIStorServiceImpl extends ServiceImpl<IOStorInvMapper, IOSt
public String insertDtl(Map whereJson) { public String insertDtl(Map whereJson) {
ArrayList<HashMap> rows = (ArrayList<HashMap>) whereJson.get("tableData"); ArrayList<HashMap> rows = (ArrayList<HashMap>) whereJson.get("tableData");
String currentUserId = SecurityUtils.getCurrentUserId(); String currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getCurrentUsername(); String nickName = SecurityUtils.getCurrentNickName();
String now = DateUtil.now(); String now = DateUtil.now();
double total_qty = 0; double total_qty = 0;
JSONObject io_mst = new JSONObject(); JSONObject io_mst = new JSONObject();

2
wms/nladmin-ui/README.md

@ -1,3 +1,3 @@
# 诺力开发平台 # 新生北安系统
/api/sysMenu/build?systemType=1 /api/sysMenu/build?systemType=1

2
wms/nladmin-ui/src/i18n/langs/zh-CN.js

@ -2,7 +2,7 @@ export default {
'lang': 'zh', 'lang': 'zh',
// 平台 // 平台
'platform': { 'platform': {
'title': '诺力开发平台', 'title': '新生北安系统',
'tip1': '用户名不能为空', 'tip1': '用户名不能为空',
'tip2': '密码不能为空', 'tip2': '密码不能为空',
'tip3': '验证码不能为空' 'tip3': '验证码不能为空'

2
wms/nladmin-ui/src/layout/components/Sidebar/Logo.vue

@ -26,7 +26,7 @@ export default {
}, },
data() { data() {
return { return {
title: '诺力开发平台', title: '新生北安系统',
logo: Logo, logo: Logo,
title_param: 'platform' title_param: 'platform'
} }

Loading…
Cancel
Save