MoneyQ 发布系统代码 [后台服务，演示应用]

app_Web/src/service/ibizorder-detail/count-money-logic-base.ts

@@ -67,15 +67,6 @@ export default class CountMoneyLogicBase {
         return true;
     }
 
-    /**
-     * 计算1节点结果
-     * 
-     * @param params 传入参数
-     */
-    public compute1Cond(params:any):boolean{
-        return true;
-    }
-
     /**
      * 执行逻辑
      * 
@@ -97,9 +88,6 @@ export default class CountMoneyLogicBase {
         if(this.compute0Cond(params)){
             return this.executeRawsqlcall1(context,params,isloading);   
         }
-        if(this.compute1Cond(params)){
-            return this.executeRawsqlcall2(context,params,isloading);   
-        }
     }
 
     /**
@@ -114,17 +102,5 @@ export default class CountMoneyLogicBase {
         return this.paramsMap.get(this.defaultParamName).data;
     }
 
-    /**
-    * fad
-    * 
-    * @param context 应用上下文
-    * @param params 传入参数
-    */
-    private async executeRawsqlcall2(context:any,params:any,isloading:boolean){
-        // RAWSQLCALL暂未支持
-        console.log("RAWSQLCALL暂未支持");
-        return this.paramsMap.get(this.defaultParamName).data;
-    }
-
 
 }
\ No newline at end of file

app_Web/src/widgets/ibizbook/default-searchform/default-searchform-base.vue

@@ -663,7 +663,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public load(opt: any = {}): void {
         if(!this.loadAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr5DataView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKGroupByCodelistListView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -699,7 +699,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public loadDraft(opt: any = {},mode?:string): void {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr5DataView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKGroupByCodelistListView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
             return;
         }
         const arg: any = { ...opt } ;

app_Web/src/widgets/ibizbook/quicksearchform-searchform/quicksearchform-searchform-base.vue

@@ -621,7 +621,7 @@ export default class QUICKSEARCHFORMBase extends Vue implements ControlInterface
      */
     public load(opt: any = {}): void {
         if(!this.loadAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKCalendarView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKListView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -657,7 +657,7 @@ export default class QUICKSEARCHFORMBase extends Vue implements ControlInterface
      */
     public loadDraft(opt: any = {},mode?:string): void {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKCalendarView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKListView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
             return;
         }
         const arg: any = { ...opt } ;

app_Web/src/widgets/ibizbook/usr4-dataview/usr4-dataview-base.vue

@@ -649,7 +649,7 @@ export default class Usr4Base extends Vue implements ControlInterface {
      */
     public load(opt: any = {}, isReset: boolean = false): void {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4DataView' + (this.$t('app.list.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKTestCLDataView' + (this.$t('app.list.notConfig.fetchAction') as string) });
             return;
         }      
         const arg: any = {...opt};
@@ -728,7 +728,7 @@ export default class Usr4Base extends Vue implements ControlInterface {
      */
     public async remove(datas: any[]): Promise<any> {
         if(!this.removeAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4DataView' + (this.$t('app.gridpage.notConfig.removeAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKTestCLDataView' + (this.$t('app.gridpage.notConfig.removeAction') as string) });
             return;
         }
         let _datas:any[] = [];
@@ -837,7 +837,7 @@ export default class Usr4Base extends Vue implements ControlInterface {
             try {
                 if(Object.is(item.rowDataState, 'create')){
                     if(!this.createAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4DataView' + (this.$t('app.list.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKTestCLDataView' + (this.$t('app.list.notConfig.createAction') as string) });
                     }else{
                       Object.assign(item,{viewparams:this.viewparams});
                       let response = await this.service.add(this.createAction, JSON.parse(JSON.stringify(this.context)),item, this.showBusyIndicator);
@@ -845,7 +845,7 @@ export default class Usr4Base extends Vue implements ControlInterface {
                     }
                 }else if(Object.is(item.rowDataState, 'update')){
                     if(!this.updateAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4DataView' + (this.$t('app.list.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKTestCLDataView' + (this.$t('app.list.notConfig.updateAction') as string) });
                     }else{
                         Object.assign(item,{viewparams:this.viewparams});
                         if(item.ibizbook){

app_Web/src/widgets/ibizbook/usr4-dataview/usr4-dataview-model.ts

@@ -69,11 +69,6 @@ export default class Usr4Model {
         prop: 'n_ibizbookname_like',
         dataType: 'QUERYPARAM'
       },
-      {
-        name: 'n_price_gtandeq',
-        prop: 'n_price_gtandeq',
-        dataType: 'QUERYPARAM'
-      },
 
 
       {

app_Web/src/widgets/ibizorder/list-exp-list/list-exp-list-base.vue

@@ -522,7 +522,7 @@ export default class ListExpBase extends Vue implements ControlInterface {
      */
     public load(opt: any = {}): void {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderListExpView' + (this.$t('app.list.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderListExpView_layout' + (this.$t('app.list.notConfig.fetchAction') as string) });
             return;
         }        
         const arg: any = {...opt};
@@ -638,7 +638,7 @@ export default class ListExpBase extends Vue implements ControlInterface {
      */
     public async remove(datas: any[]): Promise<any> {
         if(!this.removeAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderListExpView' + (this.$t('app.list.notConfig.removeAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderListExpView_layout' + (this.$t('app.list.notConfig.removeAction') as string) });
             return;
         }
         if (datas.length === 0) {
@@ -733,7 +733,7 @@ export default class ListExpBase extends Vue implements ControlInterface {
             try {
                 if(Object.is(item.rowDataState, 'create')){
                     if(!this.createAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderListExpView' + (this.$t('app.list.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderListExpView_layout' + (this.$t('app.list.notConfig.createAction') as string) });
                     }else{
                       Object.assign(item,{viewparams:this.viewparams});
                       let response = await this.service.add(this.createAction, JSON.parse(JSON.stringify(this.context)),item, this.showBusyIndicator);
@@ -741,7 +741,7 @@ export default class ListExpBase extends Vue implements ControlInterface {
                     }
                 }else if(Object.is(item.rowDataState, 'update')){
                     if(!this.updateAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.warning') as string), desc: 'IBIZOrderListExpView' + (this.$t('app.list.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.warning') as string), desc: 'IBIZOrderListExpView_layout' + (this.$t('app.list.notConfig.updateAction') as string) });
                     }else{
                         Object.assign(item,{viewparams:this.viewparams});
                         if(item.ibizorder){

app_Web/src/widgets/ibizorder/main-grid/main-grid-base.vue

@@ -291,7 +291,7 @@ export default class MainBase extends Vue implements ControlInterface {
      * @param {*} [$event] 事件源
      * @param {*} [xData]  执行行为所需当前部件
      * @param {*} [actionContext]  执行行为上下文
-     * @memberof IBIZOrderSF1GridViewBase
+     * @memberof IBIZOrderPickupGridViewBase
      */
     public Edit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
         if (args.length === 0) {
@@ -413,20 +413,6 @@ export default class MainBase extends Vue implements ControlInterface {
         return this.selections[0];
     }
 
-    /**
-     * 打开新建数据视图
-     *
-     * @type {any}
-     * @memberof MainBase
-     */
-    @Prop() public newdata: any;
-    /**
-     * 打开编辑数据视图
-     *
-     * @type {any}
-     * @memberof MainBase
-     */
-    @Prop() public opendata: any;
     
     /**
     * 是否嵌入关系界面
@@ -959,7 +945,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public load(opt: any = {}, pageReset: boolean = false): void {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
             return;
         }
         if(pageReset){
@@ -1054,7 +1040,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public async remove(datas: any[]): Promise<any> {
         if(!this.removeAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.removeAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.removeAction') as string) });
             return;
         }
         let _datas:any[] = [];
@@ -1160,7 +1146,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public addBatch(arg: any = {}): void {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
             return;
         }
         if(!arg){
@@ -2077,7 +2063,7 @@ export default class MainBase extends Vue implements ControlInterface {
             try {
                 if(Object.is(item.rowDataState, 'create')){
                     if(!this.createAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.createAction') as string) });
                     }else{
                       Object.assign(item,{viewparams:this.viewparams});
                       let response = await this.service.add(this.createAction, JSON.parse(JSON.stringify(this.context)),item, this.showBusyIndicator);
@@ -2085,7 +2071,7 @@ export default class MainBase extends Vue implements ControlInterface {
                     }
                 }else if(Object.is(item.rowDataState, 'update')){
                     if(!this.updateAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
                     }else{
                         Object.assign(item,{viewparams:this.viewparams});
                         if(item.ibizorder){
@@ -2152,7 +2138,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public newRow(args: any[], params?: any, $event?: any, xData?: any): void {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.loaddraftAction') as string) });
             return;
         }
         let _this = this;

app_Web/src/widgets/ibizorder/main-grid/main-grid-model.ts

@@ -104,21 +104,6 @@ export default class MainModel {
         prop: 'n_ibizordername_like',
         dataType: 'QUERYPARAM'
       },
-      {
-        name: 'n_orderstate_eq',
-        prop: 'n_orderstate_eq',
-        dataType: 'QUERYPARAM'
-      },
-      {
-        name: 'n_ordertime_gt',
-        prop: 'n_ordertime_gt',
-        dataType: 'QUERYPARAM'
-      },
-      {
-        name: 'n_ordertime_lt',
-        prop: 'n_ordertime_lt',
-        dataType: 'QUERYPARAM'
-      },
 
         {
           name:'size',

demo-boot/src/main/resources/static/remotemodel/PSMODULES/Sample/PSDATAENTITIES/IBIZOrderDetail.json

@@ -2732,16 +2732,6 @@
           "modelref" : true,
           "id" : "Begin"
         }
-      }, {
-        "getDstPSDELogicNode" : {
-          "modelref" : true,
-          "id" : "Rawsqlcall2"
-        },
-        "name" : "连接",
-        "getSrcPSDELogicNode" : {
-          "modelref" : true,
-          "id" : "Begin"
-        }
       } ],
       "parallelOutput" : true
     }, {
@@ -2773,16 +2763,6 @@
       } ],
       "sql" : "select (?*?) as AMOUNT from dual",
       "fillDstLogicParam" : true
-    }, {
-      "codeName" : "Rawsqlcall2",
-      "getDstPSDELogicParam" : {
-        "modelref" : true,
-        "id" : "Default"
-      },
-      "logicNodeType" : "RAWSQLCALL",
-      "name" : "fad",
-      "fillDstLogicParam" : true,
-      "parallelOutput" : true
     } ],
     "getPSDELogicParams" : [ {
       "codeName" : "Default",

demo-boot/src/main/resources/static/remotemodel/PSMODULES/Sample/PSDATAENTITIES/IBIZOrderDetail/PSDELOGICS/CountMoney.json

@@ -18,16 +18,6 @@
         "modelref" : true,
         "id" : "Begin"
       }
-    }, {
-      "getDstPSDELogicNode" : {
-        "modelref" : true,
-        "id" : "Rawsqlcall2"
-      },
-      "name" : "连接",
-      "getSrcPSDELogicNode" : {
-        "modelref" : true,
-        "id" : "Begin"
-      }
     } ],
     "parallelOutput" : true
   }, {
@@ -59,16 +49,6 @@
     } ],
     "sql" : "select (?*?) as AMOUNT from dual",
     "fillDstLogicParam" : true
-  }, {
-    "codeName" : "Rawsqlcall2",
-    "getDstPSDELogicParam" : {
-      "modelref" : true,
-      "id" : "Default"
-    },
-    "logicNodeType" : "RAWSQLCALL",
-    "name" : "fad",
-    "fillDstLogicParam" : true,
-    "parallelOutput" : true
   } ],
   "getPSDELogicParams" : [ {
     "codeName" : "Default",

demo-boot/src/main/resources/static/remotemodel/PSMODULES/Sample/PSDATAENTITIES/IBIZOrderDetail/PSDELOGICS/CountMoney.json.bpmn

@@ -14,12 +14,7 @@
                         <businessRuleTask activiti:exclusive="true" g:ruleFlowGroup="ibizorderdetailcountmoneyrawsqlcall1" id="rawsqlcall1" implementation="http://www.jboss.org/drools/rule" name="统计金额"/>
                         <endEvent id="rawsqlcall1_end" name="end"/>
                         <sequenceFlow id="rawsqlcall1_end_line" sourceRef="rawsqlcall1" targetRef="rawsqlcall1_end"/>
-                        <businessRuleTask activiti:exclusive="true" g:ruleFlowGroup="ibizorderdetailcountmoneyrawsqlcall2" id="rawsqlcall2" implementation="http://www.jboss.org/drools/rule" name="fad"/>
-                        <endEvent id="rawsqlcall2_end" name="end"/>
-                        <sequenceFlow id="rawsqlcall2_end_line" sourceRef="rawsqlcall2" targetRef="rawsqlcall2_end"/>
                     <sequenceFlow id="begin_rawsqlcall1" sourceRef="begin" targetRef="rawsqlcall1">
                     </sequenceFlow>
-                    <sequenceFlow id="begin_rawsqlcall2" sourceRef="begin" targetRef="rawsqlcall2">
-                    </sequenceFlow>
         </process>
     </definitions>
\ No newline at end of file

demo-boot/src/main/resources/static/remotemodel/PSMODULES/Sample/PSDATAENTITIES/IBIZOrderDetail/PSDELOGICS/CountMoney.json.drl

@@ -36,21 +36,4 @@ package cn.ibizlab.sample.logic.ibizorderdetaillogic.countmoney;
                                     }
                             }
                         update(ibizorderdetailcountmoneydefault);//更新fact中变量值
-            end
-
-            //逻辑处理节点[fad]
-            rule "rawsqlcall2"
-            ruleflow-group "ibizorderdetailcountmoneyrawsqlcall2"
-            when
-            then
-                        Map param = null;
-                        String strSql="";
-                        java.util.List<JSONObject> entities=iBzSysIbizorderdetailDefaultService.select(strSql,param);//SQL调用
-                            if(entities.size()>0){
-                            JSONObject entity=entities.get(0);
-                                    for (Map.Entry entry : entity.entrySet()) {
-                                    ibizorderdetailcountmoneydefault.set(String.valueOf(entry.getKey()),entry.getValue());
-                                    }
-                            }
-                        update(ibizorderdetailcountmoneydefault);//更新fact中变量值
             end
\ No newline at end of file

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZOrderDetail.json

@@ -774,16 +774,6 @@
           "modelref" : true,
           "id" : "Begin"
         }
-      }, {
-        "getDstPSDELogicNode" : {
-          "modelref" : true,
-          "id" : "Rawsqlcall2"
-        },
-        "name" : "连接",
-        "getSrcPSDELogicNode" : {
-          "modelref" : true,
-          "id" : "Begin"
-        }
       } ],
       "parallelOutput" : true
     }, {
@@ -815,16 +805,6 @@
       } ],
       "sql" : "select (?*?) as AMOUNT from dual",
       "fillDstLogicParam" : true
-    }, {
-      "codeName" : "Rawsqlcall2",
-      "getDstPSDELogicParam" : {
-        "modelref" : true,
-        "id" : "Default"
-      },
-      "logicNodeType" : "RAWSQLCALL",
-      "name" : "fad",
-      "fillDstLogicParam" : true,
-      "parallelOutput" : true
     } ],
     "getPSDELogicParams" : [ {
       "codeName" : "Default",

demo-core/src/main/resources/rules/IBIZOrderDetailCountMoneyRule.drl

@@ -38,20 +38,3 @@ ruleflow-group "ibizorderdetailcountmoneyrawsqlcall1"
     update(ibizorderdetailcountmoneydefault);//更新fact中变量值
     end
 
-//逻辑处理节点[fad]
-rule "rawsqlcall2"
-ruleflow-group "ibizorderdetailcountmoneyrawsqlcall2"
-    when
-    then
-    Map param = null;
-    String strSql="";
-    java.util.List<JSONObject> entities=iBzSysIbizorderdetailDefaultService.select(strSql,param);//SQL调用
-    if(entities.size()>0 && !ObjectUtils.isEmpty(entities.get(0))){
-        JSONObject entity=entities.get(0);
-        for (Map.Entry entry : entity.entrySet()) {
-            ibizorderdetailcountmoneydefault.set(String.valueOf(entry.getKey()),entry.getValue());
-        }
-    }
-    update(ibizorderdetailcountmoneydefault);//更新fact中变量值
-    end
-

demo-core/src/main/resources/rules/IBIZOrderDetailCountMoneyRuleFlow.bpmn

@@ -14,13 +14,8 @@
      <businessRuleTask activiti:exclusive="true" g:ruleFlowGroup="ibizorderdetailcountmoneyrawsqlcall1" id="rawsqlcall1" implementation="http://www.jboss.org/drools/rule" name="统计金额"/>
      <endEvent id="rawsqlcall1_end" name="end"/>
      <sequenceFlow id="rawsqlcall1_end_line" sourceRef="rawsqlcall1" targetRef="rawsqlcall1_end"/>
-     <businessRuleTask activiti:exclusive="true" g:ruleFlowGroup="ibizorderdetailcountmoneyrawsqlcall2" id="rawsqlcall2" implementation="http://www.jboss.org/drools/rule" name="fad"/>
-     <endEvent id="rawsqlcall2_end" name="end"/>
-     <sequenceFlow id="rawsqlcall2_end_line" sourceRef="rawsqlcall2" targetRef="rawsqlcall2_end"/>
      <sequenceFlow id="begin_rawsqlcall1" sourceRef="begin" targetRef="rawsqlcall1">
      </sequenceFlow>
-     <sequenceFlow id="begin_rawsqlcall2" sourceRef="begin" targetRef="rawsqlcall2">
-     </sequenceFlow>
     </process>
 </definitions>