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

app_Web/src/service/ibizorder-detail/get-unit-and-price-logic-base.ts

@@ -371,6 +371,13 @@ export default class GetUnitAndPriceLogicBase {
     Object.assign(tempDstParam0Context,{ibizorder:tempSrcParam0Data['ibizorderid']});
     Object.assign(tempDstParam0Data,{ibizorderid:tempSrcParam0Data['ibizorderid']});
     this.paramsMap.set('Order',{data:tempDstParam0Data,context:tempDstParam0Context});
+    let tempDstParam1Context:any = this.paramsMap.get('Order').context?this.paramsMap.get('Order').context:{};
+    let tempDstParam1Data:any = this.paramsMap.get('Order').data?this.paramsMap.get('Order').data:{};
+    this.paramsMap.set('Order',{data:tempDstParam1Data,context:tempDstParam1Context});
+    let tempDstParam2Context:any = this.paramsMap.get('Order').context?this.paramsMap.get('Order').context:{};
+    let tempDstParam2Data:any = this.paramsMap.get('Order').data?this.paramsMap.get('Order').data:{};
+    Object.assign(tempDstParam2Data,{createman:"111"});
+    this.paramsMap.set('Order',{data:tempDstParam2Data,context:tempDstParam2Context});
         if(this.compute9Cond(params)){
             return this.executeDEACTION2(context,params,isloading);   
         }

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

@@ -712,7 +712,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: 'IBIZBOOKUsr9GridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKCustomView_layout' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -748,7 +748,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public async loadDraft(opt: any = {},mode?:string): Promise<any> {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr9GridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKCustomView_layout' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
             return;
         }
         const arg: any = { ...opt } ;

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

@@ -48,14 +48,14 @@
                     <div v-show="flag" class="batch-toolbar">
                                 <div class='toolbar-container'>
                 <tooltip :transfer="true" :max-width="600">
-                        <i-button v-show="dataviewexpviewdataviewexpbar_dataview_batchtoolbarModels.deuiaction1.visabled" :disabled="dataviewexpviewdataviewexpbar_dataview_batchtoolbarModels.deuiaction1.disabled" class='' v-button-loading:i-button @click="dataviewexpbar_dataview_batchtoolbar_click({ tag: 'deuiaction1' }, $event)">
+                        <i-button v-show="usr2dataviewdataview_batchtoolbarModels.deuiaction1.visabled" :disabled="usr2dataviewdataview_batchtoolbarModels.deuiaction1.disabled" class='' v-button-loading:i-button @click="dataview_batchtoolbar_click({ tag: 'deuiaction1' }, $event)">
                             <i class='fa fa-edit'></i>
                             <span class='caption'>{{'编辑'}}</span>
                         </i-button>
                     <div slot='content'>{{$t('TBB.TEXT.*.EDIT', '编辑')}}</div>
                 </tooltip>
                 <tooltip :transfer="true" :max-width="600">
-                        <i-button v-show="dataviewexpviewdataviewexpbar_dataview_batchtoolbarModels.deuiaction2.visabled" :disabled="dataviewexpviewdataviewexpbar_dataview_batchtoolbarModels.deuiaction2.disabled" class='' v-button-loading:i-button @click="dataviewexpbar_dataview_batchtoolbar_click({ tag: 'deuiaction2' }, $event)">
+                        <i-button v-show="usr2dataviewdataview_batchtoolbarModels.deuiaction2.visabled" :disabled="usr2dataviewdataview_batchtoolbarModels.deuiaction2.disabled" class='' v-button-loading:i-button @click="dataview_batchtoolbar_click({ tag: 'deuiaction2' }, $event)">
                             <i class='fa fa-remove'></i>
                             <span class='caption'>{{'删除'}}</span>
                         </i-button>
@@ -202,18 +202,18 @@ export default class Usr2Base extends Vue implements ControlInterface {
     public appEntityService: IBIZBOOKEntityService = new IBIZBOOKEntityService({ $store: this.$store });
 
     /**
-     * dataviewexpbar_dataview_batchtoolbar 部件 click 事件
+     * dataview_batchtoolbar 部件 click 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof Usr2Base
      */
-    public dataviewexpbar_dataview_batchtoolbar_click($event: any, $event2?: any) {
+    public dataview_batchtoolbar_click($event: any, $event2?: any) {
         if (Object.is($event.tag, 'deuiaction1')) {
-            this.dataviewexpbar_dataview_batchtoolbar_deuiaction1_click(null, 'dataviewexpbar_dataview_batchtoolbar', $event2);
+            this.dataview_batchtoolbar_deuiaction1_click(null, 'dataview_batchtoolbar', $event2);
         }
         if (Object.is($event.tag, 'deuiaction2')) {
-            this.dataviewexpbar_dataview_batchtoolbar_deuiaction2_click(null, 'dataviewexpbar_dataview_batchtoolbar', $event2);
+            this.dataview_batchtoolbar_deuiaction2_click(null, 'dataview_batchtoolbar', $event2);
         }
     }
     
@@ -226,7 +226,7 @@ export default class Usr2Base extends Vue implements ControlInterface {
      * @param {*} [$event]
      * @memberof 
      */
-    public dataviewexpbar_dataview_batchtoolbar_deuiaction1_click(params: any = {}, tag?: any, $event?: any) {
+    public dataview_batchtoolbar_deuiaction1_click(params: any = {}, tag?: any, $event?: any) {
         // 参数
         // 取数
         let datas: any[] = [];
@@ -254,7 +254,7 @@ export default class Usr2Base extends Vue implements ControlInterface {
      * @param {*} [$event]
      * @memberof 
      */
-    public dataviewexpbar_dataview_batchtoolbar_deuiaction2_click(params: any = {}, tag?: any, $event?: any) {
+    public dataview_batchtoolbar_deuiaction2_click(params: any = {}, tag?: any, $event?: any) {
         // 参数
         // 取数
         let datas: any[] = [];
@@ -282,7 +282,7 @@ export default class Usr2Base extends Vue implements ControlInterface {
      * @param {*} [$event]
      * @memberof 
      */
-    public dataviewexpbar_dataview_memo1_u37f11a8_click(params: any = {}, tag?: any, $event?: any) {
+    public dataview_memo1_u37f11a8_click(params: any = {}, tag?: any, $event?: any) {
         // 取数
         let datas: any[] = [];
         let xData: any = null;
@@ -309,7 +309,7 @@ export default class Usr2Base extends Vue implements ControlInterface {
      * @param {*} [$event]
      * @memberof 
      */
-    public dataviewexpbar_dataview_memo1_uc365542_click(params: any = {}, tag?: any, $event?: any) {
+    public dataview_memo1_uc365542_click(params: any = {}, tag?: any, $event?: any) {
         // 取数
         let datas: any[] = [];
         let xData: any = null;
@@ -337,7 +337,7 @@ export default class Usr2Base extends Vue implements ControlInterface {
      * @param {*} [$event] 事件源
      * @param {*} [xData]  执行行为所需当前部件
      * @param {*} [actionContext]  执行行为上下文
-     * @memberof IBIZBOOKDataViewExpViewBase
+     * @memberof IBIZBOOKUsr2DataViewBase
      */
     public Edit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
         if (args.length === 0) {
@@ -363,7 +363,7 @@ export default class Usr2Base extends Vue implements ControlInterface {
      * @param {*} [$event] 事件源
      * @param {*} [xData]  执行行为所需当前部件
      * @param {*} [actionContext]  执行行为上下文
-     * @memberof IBIZBOOKDataViewExpViewBase
+     * @memberof IBIZBOOKUsr2DataViewBase
      */
     public Remove(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
         const _this: any = this;
@@ -427,12 +427,6 @@ export default class Usr2Base extends Vue implements ControlInterface {
         }
         let result: boolean = true;
         Object.assign(actionData, args);
-        if ('selectionchange'.indexOf(eventName) !== -1) {
-            result = await this.execute_dataviewexpbar_selectionchange_ctrl_logic(actionData) && result;
-        }
-        if ('load'.indexOf(eventName) !== -1) {
-            result = await this.execute_dataviewexpbar_load_ctrl_logic(actionData) && result;
-        }
         if (!result) {
             return false;
         }
@@ -440,30 +434,6 @@ export default class Usr2Base extends Vue implements ControlInterface {
         return true;
     }
 
-    /**
-     * 部件逻辑 -- dataviewexpbar_selectionchange
-     *
-     * @param {string} eventName 部件事件名称
-     * @param {any[]} data 数据
-     * @param {*} event 源事件对象
-     * @memberof Usr2Base
-     */
-    public async execute_dataviewexpbar_selectionchange_ctrl_logic(actionData: any): Promise<boolean> {
-        console.log('暂未支持 CUSTOM 类型');
-        return true;
-    }
-    /**
-     * 部件逻辑 -- dataviewexpbar_load
-     *
-     * @param {string} eventName 部件事件名称
-     * @param {any[]} data 数据
-     * @param {*} event 源事件对象
-     * @memberof Usr2Base
-     */
-    public async execute_dataviewexpbar_load_ctrl_logic(actionData: any): Promise<boolean> {
-        console.log('暂未支持 CUSTOM 类型');
-        return true;
-    }
 
 
 
@@ -708,9 +678,9 @@ export default class Usr2Base extends Vue implements ControlInterface {
      * 工具栏模型
      *
      * @type {*}
-     * @memberof IBIZBOOKDataViewExpView
+     * @memberof IBIZBOOKUsr2DataView
      */
-    public dataviewexpviewdataviewexpbar_dataview_batchtoolbarModels: any = {
+    public usr2dataviewdataview_batchtoolbarModels: any = {
         deuiaction1: { name: 'deuiaction1', actiontarget: 'NONE', caption: '编辑', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Edit', target: 'SINGLEKEY' } },
 
         deuiaction2: { name: 'deuiaction2', actiontarget: 'NONE', caption: '删除', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Remove', target: 'MULTIKEY' } },
@@ -1043,7 +1013,7 @@ export default class Usr2Base extends Vue implements ControlInterface {
      */
     public async load(opt: any = {}, isReset: boolean = false): Promise<any> {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKDataViewExpView' + (this.$t('app.list.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr2DataView' + (this.$t('app.list.notConfig.fetchAction') as string) });
             return;
         }      
         const arg: any = {...opt};
@@ -1138,7 +1108,7 @@ export default class Usr2Base 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: 'IBIZBOOKDataViewExpView' + (this.$t('app.gridpage.notConfig.removeAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr2DataView' + (this.$t('app.gridpage.notConfig.removeAction') as string) });
             return;
         }
         let _datas:any[] = [];
@@ -1255,7 +1225,7 @@ export default class Usr2Base 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: 'IBIZBOOKDataViewExpView' + (this.$t('app.list.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr2DataView' + (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);
@@ -1263,7 +1233,7 @@ export default class Usr2Base 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: 'IBIZBOOKDataViewExpView' + (this.$t('app.list.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr2DataView' + (this.$t('app.list.notConfig.updateAction') as string) });
                     }else{
                         Object.assign(item,{viewparams:this.viewparams});
                         if(item.ibizbook){
@@ -1365,16 +1335,16 @@ export default class Usr2Base extends Vue implements ControlInterface {
 	public uiAction(data: any, tag: any, $event: any) {
         $event.stopPropagation();
         if(Object.is('Edit', tag)) {
-            this.dataviewexpbar_dataview_batchtoolbar_deuiaction1_click(data, tag, $event);
+            this.dataview_batchtoolbar_deuiaction1_click(data, tag, $event);
         }
         if(Object.is('Remove', tag)) {
-            this.dataviewexpbar_dataview_batchtoolbar_deuiaction2_click(data, tag, $event);
+            this.dataview_batchtoolbar_deuiaction2_click(data, tag, $event);
         }
         if(Object.is('Edit', tag)) {
-            this.dataviewexpbar_dataview_memo1_u37f11a8_click(data, tag, $event);
+            this.dataview_memo1_u37f11a8_click(data, tag, $event);
         }
         if(Object.is('Remove', tag)) {
-            this.dataviewexpbar_dataview_memo1_uc365542_click(data, tag, $event);
+            this.dataview_memo1_uc365542_click(data, tag, $event);
         }
     }
 

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

@@ -964,7 +964,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if (!this.fetchAction) {
             this.$Notice.error({
                 title: this.$t("app.commonWords.wrong") as string,
-                desc: "IBIZOrderDetailSGridView9" + (this.$t("app.gridpage.notConfig.fetchAction") as string),
+                desc: "IBIZOrderDetailGridView9" + (this.$t("app.gridpage.notConfig.fetchAction") as string),
             });
             return;
         }
@@ -1123,7 +1123,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if (!this.removeAction) {
             this.$Notice.error({
                 title: (this.$t('app.commonWords.wrong') as string),
-                desc: 'IBIZOrderDetailSGridView9' + (this.$t('app.gridpage.notConfig.removeAction') as string)
+                desc: 'IBIZOrderDetailGridView9' + (this.$t('app.gridpage.notConfig.removeAction') as string)
             });
             return;
         }
@@ -1237,7 +1237,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: 'IBIZOrderDetailSGridView9'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDetailGridView9'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
             return;
         }
         if(!arg){
@@ -2132,7 +2132,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: 'IBIZOrderDetailSGridView9'+(this.$t('app.gridpage.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDetailGridView9'+(this.$t('app.gridpage.notConfig.createAction') as string) });
                     } else {
                         Object.assign(item, { viewparams: this.viewparams });
                         const tempContext = Util.deepCopy(this.context);
@@ -2141,7 +2141,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: 'IBIZOrderDetailSGridView9'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDetailGridView9'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
                     } else {
                         Object.assign(item, { viewparams: this.viewparams });
                         const tempContext = Util.deepCopy(this.context);
@@ -2217,7 +2217,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if(!this.loaddraftAction){
             this.$Notice.error({
                 title: (this.$t('app.commonWords.wrong') as string),
-                desc: 'IBIZOrderDetailSGridView9' + (this.$t('app.gridpage.notConfig.loaddraftAction') as string)
+                desc: 'IBIZOrderDetailGridView9' + (this.$t('app.gridpage.notConfig.loaddraftAction') as string)
             });
             return;
         }

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

@@ -3790,7 +3790,7 @@
               "id" : "Order"
             },
             "logicType" : "SINGLE",
-            "name" : "Order[AMOUNT] 大于(>) 100",
+            "name" : "Order[AMOUNT] 大于(>) (100)",
             "paramValue" : "100"
           } ]
         },
@@ -3816,7 +3816,7 @@
               "id" : "Order"
             },
             "logicType" : "SINGLE",
-            "name" : "Order[AMOUNT] 大于(>) PRICE",
+            "name" : "Order[AMOUNT] 大于(>) [PRICE]",
             "paramType" : "ENTITYFIELD",
             "paramValue" : "PRICE"
           } ]
@@ -3843,7 +3843,7 @@
               "id" : "Order"
             },
             "logicType" : "SINGLE",
-            "name" : "Order[CREATEDATE] 大于等于(>=) CREATEDATE",
+            "name" : "Order[CREATEDATE] 大于等于(>=) Product[CREATEDATE]",
             "paramType" : "SRCENTITYFIELD",
             "paramValue" : "CREATEDATE",
             "getSrcLogicParam" : {
@@ -3874,7 +3874,7 @@
               "id" : "Order"
             },
             "logicType" : "SINGLE",
-            "name" : "Order[ORDERTIME] 小于等于(<=)",
+            "name" : "Order[ORDERTIME] 小于等于(<=) [当前时间]",
             "paramType" : "CURTIME"
           } ]
         },
@@ -3937,9 +3937,28 @@
           "id" : "Default"
         },
         "srcValueType" : "SRCDLPARAM"
+      }, {
+        "dstFieldName" : "CREATEDATE",
+        "getDstPSDELogicParam" : {
+          "modelref" : true,
+          "id" : "Order"
+        },
+        "name" : "无值（NONE） ==> Order[CREATEDATE]",
+        "paramAction" : "SETPARAMVALUE",
+        "srcValueType" : "NONEVALUE"
+      }, {
+        "dstFieldName" : "CREATEMAN",
+        "getDstPSDELogicParam" : {
+          "modelref" : true,
+          "id" : "Order"
+        },
+        "name" : "直接值[111] ==> Order[CREATEMAN]",
+        "paramAction" : "SETPARAMVALUE",
+        "srcValue" : "111",
+        "srcValueType" : "SRCVALUE"
       } ],
       "rTMOSFilePath" : "psmodules/Sample/psdataentities/IBIZORDERDETAIL/psdelogics/GetUnitAndPrice/psdelogicnodes/PREPAREPARAM3",
-      "topPos" : -37
+      "topPos" : -38
     }, {
       "codeName" : "Prepareparam2",
       "leftPos" : 775,
@@ -3964,7 +3983,7 @@
               "id" : "Default"
             },
             "logicType" : "SINGLE",
-            "name" : "Default[UNITPRICE] 大于(>) Amount",
+            "name" : "Default[UNITPRICE] 大于(>) [Amount]",
             "paramType" : "ENTITYFIELD",
             "paramValue" : "Amount",
             "getSrcLogicParam" : {

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

@@ -177,7 +177,7 @@
             "id" : "Order"
           },
           "logicType" : "SINGLE",
-          "name" : "Order[AMOUNT] 大于(>) 100",
+          "name" : "Order[AMOUNT] 大于(>) (100)",
           "paramValue" : "100"
         } ]
       },
@@ -203,7 +203,7 @@
             "id" : "Order"
           },
           "logicType" : "SINGLE",
-          "name" : "Order[AMOUNT] 大于(>) PRICE",
+          "name" : "Order[AMOUNT] 大于(>) [PRICE]",
           "paramType" : "ENTITYFIELD",
           "paramValue" : "PRICE"
         } ]
@@ -230,7 +230,7 @@
             "id" : "Order"
           },
           "logicType" : "SINGLE",
-          "name" : "Order[CREATEDATE] 大于等于(>=) CREATEDATE",
+          "name" : "Order[CREATEDATE] 大于等于(>=) Product[CREATEDATE]",
           "paramType" : "SRCENTITYFIELD",
           "paramValue" : "CREATEDATE",
           "getSrcLogicParam" : {
@@ -261,7 +261,7 @@
             "id" : "Order"
           },
           "logicType" : "SINGLE",
-          "name" : "Order[ORDERTIME] 小于等于(<=)",
+          "name" : "Order[ORDERTIME] 小于等于(<=) [当前时间]",
           "paramType" : "CURTIME"
         } ]
       },
@@ -324,9 +324,28 @@
         "id" : "Default"
       },
       "srcValueType" : "SRCDLPARAM"
+    }, {
+      "dstFieldName" : "CREATEDATE",
+      "getDstPSDELogicParam" : {
+        "modelref" : true,
+        "id" : "Order"
+      },
+      "name" : "无值（NONE） ==> Order[CREATEDATE]",
+      "paramAction" : "SETPARAMVALUE",
+      "srcValueType" : "NONEVALUE"
+    }, {
+      "dstFieldName" : "CREATEMAN",
+      "getDstPSDELogicParam" : {
+        "modelref" : true,
+        "id" : "Order"
+      },
+      "name" : "直接值[111] ==> Order[CREATEMAN]",
+      "paramAction" : "SETPARAMVALUE",
+      "srcValue" : "111",
+      "srcValueType" : "SRCVALUE"
     } ],
     "rTMOSFilePath" : "psmodules/Sample/psdataentities/IBIZORDERDETAIL/psdelogics/GetUnitAndPrice/psdelogicnodes/PREPAREPARAM3",
-    "topPos" : -37
+    "topPos" : -38
   }, {
     "codeName" : "Prepareparam2",
     "leftPos" : 775,
@@ -351,7 +370,7 @@
             "id" : "Default"
           },
           "logicType" : "SINGLE",
-          "name" : "Default[UNITPRICE] 大于(>) Amount",
+          "name" : "Default[UNITPRICE] 大于(>) [Amount]",
           "paramType" : "ENTITYFIELD",
           "paramValue" : "Amount",
           "getSrcLogicParam" : {

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

@@ -121,6 +121,7 @@ package cn.ibizlab.sample.logic.ibizorderdetaillogic.getunitandprice;
             when
             then
                             ibizorderdetailgetunitandpriceorder.set("ibizorderid",ibizorderdetailgetunitandpricedefault.get("ibizorderid"));
+                            ibizorderdetailgetunitandpriceorder.set("createman","111");
                         update(ibizorderdetailgetunitandpriceproduct);//更新fact中变量值
                         update(ibizorderdetailgetunitandpriceorder);//更新fact中变量值
                         update(ibizorderdetailgetunitandpricedefault);//更新fact中变量值

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK/PSGANTTS/Usr.json

@@ -12,30 +12,6 @@
     "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK.json"
   },
   "getPSDETreeColumns" : [ {
-    "caption" : "作者",
-    "codeName" : "author",
-    "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "author",
-    "mOSFilePath" : "psdetreecols/author",
-    "name" : "author",
-    "rTMOSFilePath" : "psdetreecols/author",
-    "width" : 200,
-    "widthUnit" : "px",
-    "enableExpand" : false,
-    "enableSort" : false
-  }, {
-    "caption" : "图书名称",
-    "codeName" : "ibizbookname",
-    "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "ibizbookname",
-    "mOSFilePath" : "psdetreecols/ibizbookname",
-    "name" : "ibizbookname",
-    "rTMOSFilePath" : "psdetreecols/ibizbookname",
-    "width" : 200,
-    "widthUnit" : "px",
-    "enableExpand" : false,
-    "enableSort" : false
-  }, {
     "caption" : "归还日期",
     "codeName" : "returntime",
     "columnType" : "DEFGRIDCOLUMN",
@@ -59,6 +35,18 @@
     "widthUnit" : "px",
     "enableExpand" : false,
     "enableSort" : false
+  }, {
+    "caption" : "作者",
+    "codeName" : "author",
+    "columnType" : "DEFGRIDCOLUMN",
+    "dataItemName" : "author",
+    "mOSFilePath" : "psdetreecols/author",
+    "name" : "author",
+    "rTMOSFilePath" : "psdetreecols/author",
+    "width" : 200,
+    "widthUnit" : "px",
+    "enableExpand" : false,
+    "enableSort" : false
   }, {
     "caption" : "借出日期",
     "codeName" : "lendouttime",
@@ -71,6 +59,18 @@
     "widthUnit" : "px",
     "enableExpand" : false,
     "enableSort" : false
+  }, {
+    "caption" : "图书名称",
+    "codeName" : "ibizbookname",
+    "columnType" : "DEFGRIDCOLUMN",
+    "dataItemName" : "ibizbookname",
+    "mOSFilePath" : "psdetreecols/ibizbookname",
+    "name" : "ibizbookname",
+    "rTMOSFilePath" : "psdetreecols/ibizbookname",
+    "width" : 200,
+    "widthUnit" : "px",
+    "enableExpand" : false,
+    "enableSort" : false
   } ],
   "getPSDETreeNodeRSs" : [ {
     "getChildPSDETreeNode" : {

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK/PSTREEGRIDICES/TreeTable.json

@@ -20,13 +20,13 @@
     }
   } ],
   "getPSDETreeColumns" : [ {
-    "caption" : "图书描述",
-    "codeName" : "subtext",
+    "caption" : "图书名称",
+    "codeName" : "ibizbookname",
     "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "subtext",
-    "mOSFilePath" : "psdetreecols/subtext",
-    "name" : "subtext",
-    "rTMOSFilePath" : "psdetreecols/subtext",
+    "dataItemName" : "ibizbookname",
+    "mOSFilePath" : "psdetreecols/ibizbookname",
+    "name" : "ibizbookname",
+    "rTMOSFilePath" : "psdetreecols/ibizbookname",
     "width" : 50,
     "widthUnit" : "px",
     "enableExpand" : false,
@@ -44,13 +44,13 @@
     "enableExpand" : false,
     "enableSort" : false
   }, {
-    "caption" : "图书名称",
-    "codeName" : "ibizbookname",
+    "caption" : "图书描述",
+    "codeName" : "subtext",
     "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "ibizbookname",
-    "mOSFilePath" : "psdetreecols/ibizbookname",
-    "name" : "ibizbookname",
-    "rTMOSFilePath" : "psdetreecols/ibizbookname",
+    "dataItemName" : "subtext",
+    "mOSFilePath" : "psdetreecols/subtext",
+    "name" : "subtext",
+    "rTMOSFilePath" : "psdetreecols/subtext",
     "width" : 50,
     "widthUnit" : "px",
     "enableExpand" : false,

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

@@ -2866,7 +2866,7 @@
               "id" : "Order"
             },
             "logicType" : "SINGLE",
-            "name" : "Order[AMOUNT] 大于(>) 100",
+            "name" : "Order[AMOUNT] 大于(>) (100)",
             "paramValue" : "100"
           } ]
         },
@@ -2892,7 +2892,7 @@
               "id" : "Order"
             },
             "logicType" : "SINGLE",
-            "name" : "Order[AMOUNT] 大于(>) PRICE",
+            "name" : "Order[AMOUNT] 大于(>) [PRICE]",
             "paramType" : "ENTITYFIELD",
             "paramValue" : "PRICE"
           } ]
@@ -2919,7 +2919,7 @@
               "id" : "Order"
             },
             "logicType" : "SINGLE",
-            "name" : "Order[CREATEDATE] 大于等于(>=) CREATEDATE",
+            "name" : "Order[CREATEDATE] 大于等于(>=) Product[CREATEDATE]",
             "paramType" : "SRCENTITYFIELD",
             "paramValue" : "CREATEDATE",
             "getSrcLogicParam" : {
@@ -2950,7 +2950,7 @@
               "id" : "Order"
             },
             "logicType" : "SINGLE",
-            "name" : "Order[ORDERTIME] 小于等于(<=)",
+            "name" : "Order[ORDERTIME] 小于等于(<=) [当前时间]",
             "paramType" : "CURTIME"
           } ]
         },
@@ -3013,9 +3013,28 @@
           "id" : "Default"
         },
         "srcValueType" : "SRCDLPARAM"
+      }, {
+        "dstFieldName" : "CREATEDATE",
+        "getDstPSDELogicParam" : {
+          "modelref" : true,
+          "id" : "Order"
+        },
+        "name" : "无值（NONE） ==> Order[CREATEDATE]",
+        "paramAction" : "SETPARAMVALUE",
+        "srcValueType" : "NONEVALUE"
+      }, {
+        "dstFieldName" : "CREATEMAN",
+        "getDstPSDELogicParam" : {
+          "modelref" : true,
+          "id" : "Order"
+        },
+        "name" : "直接值[111] ==> Order[CREATEMAN]",
+        "paramAction" : "SETPARAMVALUE",
+        "srcValue" : "111",
+        "srcValueType" : "SRCVALUE"
       } ],
       "rTMOSFilePath" : "pssysapps/Web/psappdataentities/IBIZOrderDetail/psappdelogics/GetUnitAndPrice/psappdelogicnodes/PREPAREPARAM3",
-      "topPos" : -37
+      "topPos" : -38
     }, {
       "codeName" : "Prepareparam2",
       "leftPos" : 775,
@@ -3040,7 +3059,7 @@
               "id" : "Default"
             },
             "logicType" : "SINGLE",
-            "name" : "Default[UNITPRICE] 大于(>) Amount",
+            "name" : "Default[UNITPRICE] 大于(>) [Amount]",
             "paramType" : "ENTITYFIELD",
             "paramValue" : "Amount",
             "getSrcLogicParam" : {

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZBOOKGanttView.json

@@ -46,30 +46,6 @@
       "id" : "GANTT"
     },
     "getPSDETreeColumns" : [ {
-      "caption" : "作者",
-      "codeName" : "author",
-      "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "author",
-      "mOSFilePath" : "psdetreecols/author",
-      "name" : "author",
-      "rTMOSFilePath" : "psdetreecols/author",
-      "width" : 200,
-      "widthUnit" : "px",
-      "enableExpand" : false,
-      "enableSort" : false
-    }, {
-      "caption" : "图书名称",
-      "codeName" : "ibizbookname",
-      "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "ibizbookname",
-      "mOSFilePath" : "psdetreecols/ibizbookname",
-      "name" : "ibizbookname",
-      "rTMOSFilePath" : "psdetreecols/ibizbookname",
-      "width" : 200,
-      "widthUnit" : "px",
-      "enableExpand" : false,
-      "enableSort" : false
-    }, {
       "caption" : "归还日期",
       "codeName" : "returntime",
       "columnType" : "DEFGRIDCOLUMN",
@@ -93,6 +69,18 @@
       "widthUnit" : "px",
       "enableExpand" : false,
       "enableSort" : false
+    }, {
+      "caption" : "作者",
+      "codeName" : "author",
+      "columnType" : "DEFGRIDCOLUMN",
+      "dataItemName" : "author",
+      "mOSFilePath" : "psdetreecols/author",
+      "name" : "author",
+      "rTMOSFilePath" : "psdetreecols/author",
+      "width" : 200,
+      "widthUnit" : "px",
+      "enableExpand" : false,
+      "enableSort" : false
     }, {
       "caption" : "借出日期",
       "codeName" : "lendouttime",
@@ -105,6 +93,18 @@
       "widthUnit" : "px",
       "enableExpand" : false,
       "enableSort" : false
+    }, {
+      "caption" : "图书名称",
+      "codeName" : "ibizbookname",
+      "columnType" : "DEFGRIDCOLUMN",
+      "dataItemName" : "ibizbookname",
+      "mOSFilePath" : "psdetreecols/ibizbookname",
+      "name" : "ibizbookname",
+      "rTMOSFilePath" : "psdetreecols/ibizbookname",
+      "width" : 200,
+      "widthUnit" : "px",
+      "enableExpand" : false,
+      "enableSort" : false
     } ],
     "getPSDETreeNodeRSs" : [ {
       "getChildPSDETreeNode" : {

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZBOOKTreeGridExView.json

@@ -100,13 +100,13 @@
       "id" : "TREEGRIDEX"
     },
     "getPSDETreeColumns" : [ {
-      "caption" : "图书描述",
-      "codeName" : "subtext",
+      "caption" : "图书名称",
+      "codeName" : "ibizbookname",
       "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "subtext",
-      "mOSFilePath" : "psdetreecols/subtext",
-      "name" : "subtext",
-      "rTMOSFilePath" : "psdetreecols/subtext",
+      "dataItemName" : "ibizbookname",
+      "mOSFilePath" : "psdetreecols/ibizbookname",
+      "name" : "ibizbookname",
+      "rTMOSFilePath" : "psdetreecols/ibizbookname",
       "width" : 50,
       "widthUnit" : "px",
       "enableExpand" : false,
@@ -124,13 +124,13 @@
       "enableExpand" : false,
       "enableSort" : false
     }, {
-      "caption" : "图书名称",
-      "codeName" : "ibizbookname",
+      "caption" : "图书描述",
+      "codeName" : "subtext",
       "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "ibizbookname",
-      "mOSFilePath" : "psdetreecols/ibizbookname",
-      "name" : "ibizbookname",
-      "rTMOSFilePath" : "psdetreecols/ibizbookname",
+      "dataItemName" : "subtext",
+      "mOSFilePath" : "psdetreecols/subtext",
+      "name" : "subtext",
+      "rTMOSFilePath" : "psdetreecols/subtext",
       "width" : 50,
       "widthUnit" : "px",
       "enableExpand" : false,

demo-core/src/main/resources/liquibase/h2_table.xml

@@ -393,7 +393,7 @@
 
 
     <!--输出实体[IBIZORDERDETAIL]数据结构 -->
-    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizorderdetail-101-14">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizorderdetail-102-14">
         <createTable tableName="T_IBIZORDERDETAIL">
                 <column name="IBIZORDERDETAILNAME" remarks="" type="VARCHAR(200)">
                 </column>

demo-core/src/main/resources/liquibase/view.xml

@@ -37,7 +37,7 @@
          </createView>
      </changeSet>
         <!--输出实体[IBIZORDERDETAIL]视图结构信息 runOnChange="true"  当视图发生变更时，通过liquibase强刷prod的视图，实现视图的同步-->
-     <changeSet author="a_LAB01_df847bdfd" id="view-ibizorderdetail-101-8" runOnChange="true">
+     <changeSet author="a_LAB01_df847bdfd" id="view-ibizorderdetail-102-8" runOnChange="true">
          <createView fullDefinition="false" replaceIfExists="true" viewName="V_IBIZORDERDETAIL">
                <![CDATA[ SELECT t1.[QUANTITY]*t11.[UNITPRICE] AS [AMOUNT], t1.[CREATEDATE], t1.[CREATEMAN], t1.[IBIZORDERDETAILA], t1.[IBIZORDERDETAILID], t1.[IBIZORDERDETAILNAME], t1.[IBIZORDERID], t21.[IBIZORDERNAME], t1.[IBIZUNIPRODUCTID], t11.[IBIZUNIPRODUCTNAME], t21.[ORDERUID], t1.[QUANTITY], t11.[UNIT], t11.[UNITPRICE], t1.[UPDATEDATE], t1.[UPDATEMAN] FROM [T_IBIZORDERDETAIL] t1  LEFT JOIN T_IBIZUNIPRODUCT t11 ON t1.IBIZUNIPRODUCTID = t11.IBIZUNIPRODUCTID  LEFT JOIN T_IBIZORDER t21 ON t1.IBIZORDERID = t21.IBIZORDERID  ]]>
          </createView>