优化

src/main/java/com/zzjee/wm/controller/WmToMoveGoodsController.java

@@ -161,12 +161,12 @@ public class WmToMoveGoodsController extends BaseController {
                 );
                 message = "批量保存成功";
                 String movesta = "已完成";
-                try {
-                    movesta = ResourceUtil.getConfigByName("wm.movesta");
-
-                } catch (Exception e) {
-
-                }
+//                try {
+//                    movesta = ResourceUtil.getConfigByName("wm.movesta");
+//
+//                } catch (Exception e) {
+//
+//                }
 
                 wmToMoveGoods.setMoveSta(movesta);
                 wmToMoveGoodsService.updateEntitie(wmToMoveGoods);
@@ -299,12 +299,12 @@ public class WmToMoveGoodsController extends BaseController {
                         } else {
                             message = "批量保存成功";
                             String movesta = "已完成";
-                            try {
-                                movesta = ResourceUtil.getConfigByName("wm.movesta");
-
-                            } catch (Exception e) {
-
-                            }
+//                            try {
+//                                movesta = ResourceUtil.getConfigByName("wm.movesta");
+//
+//                            } catch (Exception e) {
+//
+//                            }
                             t.setMoveSta(movesta);
                             MyBeanUtils.copyBeanNotNull2Bean(jeecgDemo, t);
                             systemService.saveOrUpdate(t);
@@ -548,12 +548,12 @@ public class WmToMoveGoodsController extends BaseController {
 //			}else{
 
             String movesta = "已完成";
-            try {
-                movesta = ResourceUtil.getConfigByName("wm.movesta");
-
-            } catch (Exception e) {
-
-            }
+//            try {
+//                movesta = ResourceUtil.getConfigByName("wm.movesta");
+//
+//            } catch (Exception e) {
+//
+//            }
             t.setMoveSta(movesta);
             wmToMoveGoodsService.saveOrUpdate(t);
             D0.setOK(true);

src/main/java/org/jeecgframework/web/system/service/impl/SystemServiceImpl.java

@@ -49,15 +49,15 @@ public class SystemServiceImpl extends CommonServiceImpl implements SystemServic
     }
 
     @Override
-	public List<DictEntity> queryDict(String dicTable, String dicCode, String dicText){
+    public List<DictEntity> queryDict(String dicTable, String dicCode, String dicText) {
         List<DictEntity> dictList = null;
         //step.1 如果没有字典表则使用系统字典表
-		if(StringUtil.isEmpty(dicTable)){
+        if (StringUtil.isEmpty(dicTable)) {
             dictList = jeecgDictDao.querySystemDict(dicCode);
-			for(DictEntity t:dictList){
+            for (DictEntity t : dictList) {
                 t.setTypename(MutiLangUtil.getMutiLangInstance().getLang(t.getTypename()));
             }
-		}else {
+        } else {
             dicText = StringUtil.isEmpty(dicText, dicCode);
             dictList = jeecgDictDao.queryCustomDict(dicTable, dicCode, dicText);
         }
@@ -80,7 +80,11 @@ public class SystemServiceImpl extends CommonServiceImpl implements SystemServic
         /*start dangzhenghui 201703016TASK #1784 【online bug】Online 表单保存的时候，报错*/
         log.setOperatetime(new Date());
         /* end dangzhenghui 201703016TASK #1784 【online bug】Online 表单保存的时候，报错*/
-		log.setTSUser(ResourceUtil.getSessionUserName());
+        try {
+            log.setTSUser(ResourceUtil.getSessionUser());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         commonDao.save(log);
     }
 
@@ -94,15 +98,15 @@ public class SystemServiceImpl extends CommonServiceImpl implements SystemServic
     @Override
     public TSType getType(String typecode, String typename, TSTypegroup tsTypegroup) {
         //TSType actType = commonDao.findUniqueByProperty(TSType.class, "typecode", typecode,tsTypegroup.getId());
-		List<TSType> ls = commonDao.findHql("from TSType where typecode = ? and typegroupid = ?",typecode,tsTypegroup.getId());
+        List<TSType> ls = commonDao.findHql("from TSType where typecode = ? and typegroupid = ?", typecode, tsTypegroup.getId());
         TSType actType = null;
-		if (ls == null || ls.size()==0) {
+        if (ls == null || ls.size() == 0) {
             actType = new TSType();
             actType.setTypecode(typecode);
             actType.setTypename(typename);
             actType.setTSTypegroup(tsTypegroup);
             commonDao.save(actType);
-		}else{
+        } else {
             actType = ls.get(0);
         }
         return actType;
@@ -168,6 +172,7 @@ public class SystemServiceImpl extends CommonServiceImpl implements SystemServic
 
     /**
      * 根据角色ID 和 菜单Id 获取 具有操作权限的按钮Codes
+     *
      * @param roleId
      * @param functionId
      * @return
@@ -195,6 +200,7 @@ public class SystemServiceImpl extends CommonServiceImpl implements SystemServic
 
     /**
      * 根据用户ID 和 菜单Id 获取 具有操作权限的按钮Codes
+     *
      * @param userId
      * @param functionId
      * @return
@@ -222,6 +228,7 @@ public class SystemServiceImpl extends CommonServiceImpl implements SystemServic
         }
         return operationCodes;
     }
+
     /**
      * 获取页面控件权限控制的
      * JS片段
@@ -231,29 +238,29 @@ public class SystemServiceImpl extends CommonServiceImpl implements SystemServic
         StringBuilder out = new StringBuilder();
         out.append("<script type=\"text/javascript\">");
         out.append("$(document).ready(function(){");
-		if(ResourceUtil.getSessionUserName().getUserName().equals("admin")|| !Globals.BUTTON_AUTHORITY_CHECK){
+        if (ResourceUtil.getSessionUserName().getUserName().equals("admin") || !Globals.BUTTON_AUTHORITY_CHECK) {
             return "";
-		}else{
+        } else {
             HttpServletRequest request = ContextHolderUtils.getRequest();
             Set<String> operationCodes = (Set<String>) request.getAttribute(Globals.OPERATIONCODES);
-			if (null!=operationCodes) {
+            if (null != operationCodes) {
                 for (String MyoperationCode : operationCodes) {
                     if (oConvertUtils.isEmpty(MyoperationCode)) {
                         break;
                     }
                     TSOperation operation = this.getEntity(TSOperation.class, MyoperationCode);
-					if (operation.getOperationcode().startsWith(".") || operation.getOperationcode().startsWith("#")){
-						if (operation.getOperationType().intValue()==Globals.OPERATION_TYPE_HIDE){
+                    if (operation.getOperationcode().startsWith(".") || operation.getOperationcode().startsWith("#")) {
+                        if (operation.getOperationType().intValue() == Globals.OPERATION_TYPE_HIDE) {
                             //out.append("$(\""+name+"\").find(\"#"+operation.getOperationcode().replaceAll(" ", "")+"\").hide();");
-							out.append("$(\""+operation.getOperationcode().replaceAll(" ", "")+"\").hide();");
-						}else {
+                            out.append("$(\"" + operation.getOperationcode().replaceAll(" ", "") + "\").hide();");
+                        } else {
                             //out.append("$(\""+name+"\").find(\"#"+operation.getOperationcode().replaceAll(" ", "")+"\").find(\":input\").attr(\"disabled\",\"disabled\");");
-							out.append("$(\""+operation.getOperationcode().replaceAll(" ", "")+"\").attr(\"disabled\",\"disabled\");");
-							out.append("$(\""+operation.getOperationcode().replaceAll(" ", "")+"\").find(\":input\").attr(\"disabled\",\"disabled\");");
+                            out.append("$(\"" + operation.getOperationcode().replaceAll(" ", "") + "\").attr(\"disabled\",\"disabled\");");
+                            out.append("$(\"" + operation.getOperationcode().replaceAll(" ", "") + "\").find(\":input\").attr(\"disabled\",\"disabled\");");
                         }
                     }
                 }
-			}else{
+            } else {
                 return "";
             }
 
@@ -292,10 +299,10 @@ public class SystemServiceImpl extends CommonServiceImpl implements SystemServic
 
 
         String newOrgCode = "";
-        if(!StringUtils.hasText(pid)) { // 第一级编码
+        if (!StringUtils.hasText(pid)) { // 第一级编码
             String sql = "select max(t.org_code) orgCode from t_s_depart t where t.parentdepartid is null";
             Map<String, Object> pOrgCodeMap = commonDao.findOneForJdbc(sql);
-            if(pOrgCodeMap.get("orgCode") != null) {
+            if (pOrgCodeMap.get("orgCode") != null) {
                 String curOrgCode = pOrgCodeMap.get("orgCode").toString();
                 newOrgCode = String.format("%0" + orgCodeLength + "d", Integer.valueOf(curOrgCode) + 1);
             } else {
@@ -304,7 +311,7 @@ public class SystemServiceImpl extends CommonServiceImpl implements SystemServic
         } else { // 下级编码
             String sql = "select max(t.org_code) orgCode from t_s_depart t where t.parentdepartid = ?";
             Map<String, Object> orgCodeMap = commonDao.findOneForJdbc(sql, pid);
-            if(orgCodeMap.get("orgCode") != null) { // 当前基本有编码时
+            if (orgCodeMap.get("orgCode") != null) { // 当前基本有编码时
                 String curOrgCode = orgCodeMap.get("orgCode").toString();
                 String pOrgCode = curOrgCode.substring(0, curOrgCode.length() - orgCodeLength);
                 String subOrgCode = curOrgCode.substring(curOrgCode.length() - orgCodeLength, curOrgCode.length());
@@ -367,8 +374,10 @@ public class SystemServiceImpl extends CommonServiceImpl implements SystemServic
         }
         return dataRulecodes;
     }
+
     /**
      * 加载所有图标
+     *
      * @return
      */
     @Override
@@ -378,16 +387,20 @@ public class SystemServiceImpl extends CommonServiceImpl implements SystemServic
             ResourceUtil.allTSIcons.put(tsIcon.getId(), tsIcon);
         }
     }
+
     /**
      * 更新图标
+     *
      * @param icon
      */
     @Override
     public void upTSIcons(TSIcon icon) {
         ResourceUtil.allTSIcons.put(icon.getId(), icon);
     }
+
     /**
      * 更新图标
+     *
      * @param icon
      */
     @Override

src/main/resources/sysConfig.properties

@@ -203,7 +203,7 @@ wms.yskz=A
 
 sys.del=database
 wm.alldown=yes
-wm.movesta=已完成
+wm.movesta=???
 cus.role=KH
 sys.weight=off