Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/baosight/hggp/hg/sc/service/ServiceHGSC001.java

@@ -34,7 +34,7 @@ public class ServiceHGSC001 extends ServiceBase {
         try {
             inInfo = super.query(inInfo, HGSC001.QUERY, new HGSC001());
             Map map = new HashMap();
-            map.put("accountCode", UserSessionUtils.getAccountCode());
+            map.put(HGSC001.FIELD_account_code, UserSessionUtils.getAccountCode());
             CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.PROJ_TYPE_BLOCK_ID), map,false);
         } catch (PlatException e) {
             LogUtils.setDetailMsg(inInfo, e, "初始化失败");
@@ -46,7 +46,7 @@ public class ServiceHGSC001 extends ServiceBase {
         try {
             inInfo = super.query(inInfo, HGSC001.QUERY, new HGSC001());
             Map map = new HashMap();
-            map.put("accountCode", UserSessionUtils.getAccountCode());
+            map.put(HGSC001.FIELD_account_code, UserSessionUtils.getAccountCode());
             CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.PROJ_TYPE_BLOCK_ID), map,false);
             inInfo.setStatus(EiConstant.STATUS_DEFAULT);
         } catch (PlatException e) {
@@ -60,7 +60,7 @@ public class ServiceHGSC001 extends ServiceBase {
         try {
             List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
             // 销售单号
-            List<Long> ids = ObjectUtils.listKey(resultRows, "id");
+            List<Long> ids = ObjectUtils.listKey(resultRows, HGSC001.FIELD_id);
             DaoUtils.update(HGSC001.BATCH_DELETE, new HashMap<String,Object>(){{put("ids",ids);}});
             HGSCTools.THGSC001A.deleteByProIds(ids);
             inInfo = this.query(inInfo);
@@ -91,7 +91,7 @@ public class ServiceHGSC001 extends ServiceBase {
         try {
             List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
             // 销售单号
-            List<Long> ids = ObjectUtils.listKey(resultRows, "id");
+            List<Long> ids = ObjectUtils.listKey(resultRows, HGSC001.FIELD_id);
             DaoUtils.update(HGSC001.BATCH_COMMIT, new HashMap<String,Object>(){{put("ids",ids);}});
             inInfo = this.query(inInfo);
             inInfo.setStatus(EiConstant.STATUS_DEFAULT);

src/main/java/com/baosight/hggp/hg/sc/service/ServiceHGSC001C.java

@@ -35,7 +35,7 @@ public class ServiceHGSC001C extends ServiceBase {
             EiInfoUtils.addBlock(inInfo,EiConstant.resultBlock,new ArrayList(){{add(hgsc001);}},HGSC001.class);
             inInfo.addBlock(CommonConstant.Field.DETAIL).addBlockMeta(new HGSC001A().eiMetadata);
             Map map = new HashMap();
-            map.put("accountCode", UserSessionUtils.getAccountCode());
+            map.put(HGSC001.FIELD_account_code, UserSessionUtils.getAccountCode());
             CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.PROJ_TYPE_BLOCK_ID), map,false);
             CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.CUSTOMER_RECORD_BLOCK_ID), map,false);
             EiInfoUtils.addBlock(inInfo,"roleCompany", UserSessionUtils.getRoleCompany(), Company.class);

src/main/java/com/baosight/hggp/hg/sc/service/ServiceHGSC001D.java

@@ -36,7 +36,7 @@ public class ServiceHGSC001D extends ServiceBase {
                     Long.valueOf(String.valueOf(resultMap.get(HGSC001.FIELD_id))));
             EiInfoUtils.addBlock(inInfo,CommonConstant.Field.DETAIL, hgsc001AList, HGSC001A.class);
             Map map = new HashMap();
-            map.put("accountCode", UserSessionUtils.getAccountCode());
+            map.put(HGSC001.FIELD_account_code, UserSessionUtils.getAccountCode());
             CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.PROJ_TYPE_BLOCK_ID), map,false);
             CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.CUSTOMER_RECORD_BLOCK_ID), map,false);
             EiInfoUtils.addBlock(inInfo,"roleCompany", UserSessionUtils.getRoleCompany(), Company.class);

src/main/java/com/baosight/hggp/hg/sc/service/ServiceHGSC001U.java

@@ -38,7 +38,7 @@ public class ServiceHGSC001U extends ServiceBase {
                     Long.valueOf(String.valueOf(resultMap.get(HGSC001.FIELD_id))));
             EiInfoUtils.addBlock(inInfo,CommonConstant.Field.DETAIL, hgsc001AList, HGSC001A.class);
             Map map = new HashMap();
-            map.put("accountCode", UserSessionUtils.getAccountCode());
+            map.put(HGSC001.FIELD_account_code, UserSessionUtils.getAccountCode());
             CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.PROJ_TYPE_BLOCK_ID), map,false);
             CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.CUSTOMER_RECORD_BLOCK_ID), map,false);
             EiInfoUtils.addBlock(inInfo,"roleCompany", UserSessionUtils.getRoleCompany(), Company.class);

src/main/webapp/HG/SC/HGSC001C.js

@@ -112,13 +112,9 @@ $(function () {
     $("#btn_save").on("click",function(){
         JSUtils.confirm("确定对数据做\"保存\"操作? ", {
             ok: function () {
-                JSUtils.submitGrid("detail", "HGSC001", "save", {isAlldata:true,onSuccessCallback:saveCallback});
+                JSUtils.submitGrid("detail", "HGSC001", "save", {isAlldata:true,onSuccessCallback:parent.windowCallback});
             }
         });
     });
-    var saveCallback = function(ei){
-        if (ei.getStatus() >= 0) {
-            parent.JSColorbox.close();
-        }
-    }
+
 });

src/main/webapp/HG/SC/HGSC001U.js

@@ -112,13 +112,9 @@ $(function () {
     $("#btn_save").on("click",function(){
         JSUtils.confirm("确定对数据做\"保存\"操作? ", {
             ok: function () {
-                JSUtils.submitGrid("detail", "HGSC001", "save", {isAlldata:true,onSuccessCallback:saveCallback});
+                JSUtils.submitGrid("detail", "HGSC001", "save", {isAlldata:true,onSuccessCallback:parent.windowCallback});
             }
         });
     });
-    var saveCallback = function(ei){
-        if (ei.getStatus() >= 0) {
-            parent.JSColorbox.close();
-        }
-    }
+
 });