提交 4e84de0d 编写于 作者: ibizdev's avatar ibizdev

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

上级 bbb7aaed
...@@ -23,7 +23,6 @@ export default { ...@@ -23,7 +23,6 @@ export default {
memo: "备注", memo: "备注",
ibizcustomername: "客户名称", ibizcustomername: "客户名称",
ibizcustomerid: "客户标识", ibizcustomerid: "客户标识",
ibizorderuid: "IBIZSAMPLE0001标识",
}, },
views: { views: {
wfactionview: { wfactionview: {
......
...@@ -22,7 +22,6 @@ export default { ...@@ -22,7 +22,6 @@ export default {
memo: "备注", memo: "备注",
ibizcustomername: "客户名称", ibizcustomername: "客户名称",
ibizcustomerid: "客户标识", ibizcustomerid: "客户标识",
ibizorderuid: "IBIZSAMPLE0001标识",
}, },
views: { views: {
wfactionview: { wfactionview: {
......
...@@ -142,6 +142,7 @@ export default class IBIZOrderSF1EditViewBase extends Vue { ...@@ -142,6 +142,7 @@ export default class IBIZOrderSF1EditViewBase extends Vue {
* @memberof IBIZOrderSF1EditViewBase * @memberof IBIZOrderSF1EditViewBase
*/ */
public customViewParams:any ={ public customViewParams:any ={
"param1":{"isRawValue":true,"value":"https://www.baidu.com/"}
}; };
/** /**
......
...@@ -81,9 +81,6 @@ export default class DefaultModel { ...@@ -81,9 +81,6 @@ export default class DefaultModel {
{ {
name: 'ibizcustomerid', name: 'ibizcustomerid',
}, },
{
name: 'ibizorderuid',
},
] ]
} }
......
...@@ -81,9 +81,6 @@ export default class DefaultModel { ...@@ -81,9 +81,6 @@ export default class DefaultModel {
{ {
name: 'ibizcustomerid', name: 'ibizcustomerid',
}, },
{
name: 'ibizorderuid',
},
] ]
} }
......
...@@ -114,11 +114,6 @@ export default class MainModel { ...@@ -114,11 +114,6 @@ export default class MainModel {
prop: 'ibizordername', prop: 'ibizordername',
dataType: 'TEXT', dataType: 'TEXT',
}, },
{
name: 'ibizorderuid',
prop: 'ibizorderuid',
dataType: 'PICKUP',
},
{ {
name: 'srfdataaccaction', name: 'srfdataaccaction',
prop: 'ibizorderid', prop: 'ibizorderid',
......
...@@ -81,9 +81,6 @@ export default class ODSP_WFExpViewexpbarModel { ...@@ -81,9 +81,6 @@ export default class ODSP_WFExpViewexpbarModel {
{ {
name: 'ibizcustomerid', name: 'ibizcustomerid',
}, },
{
name: 'ibizorderuid',
},
] ]
} }
......
...@@ -81,9 +81,6 @@ export default class PickupViewpickupviewpanelModel { ...@@ -81,9 +81,6 @@ export default class PickupViewpickupviewpanelModel {
{ {
name: 'ibizcustomerid', name: 'ibizcustomerid',
}, },
{
name: 'ibizorderuid',
},
] ]
} }
......
...@@ -74,11 +74,6 @@ export default class UIPART_0015Model { ...@@ -74,11 +74,6 @@ export default class UIPART_0015Model {
prop: 'ibizordername', prop: 'ibizordername',
dataType: 'TEXT', dataType: 'TEXT',
}, },
{
name: 'ibizorderuid',
prop: 'ibizorderuid',
dataType: 'PICKUP',
},
{ {
name: 'srfdataaccaction', name: 'srfdataaccaction',
prop: 'ibizorderid', prop: 'ibizorderid',
......
...@@ -59,6 +59,11 @@ export default class UIPART_0017Model { ...@@ -59,6 +59,11 @@ export default class UIPART_0017Model {
dataType: 'DATE', dataType: 'DATE',
isEditable:true isEditable:true
}, },
{
name: 'updatedate',
prop: 'updatedate',
dataType: 'DATETIME',
},
{ {
name: 'ibizordername', name: 'ibizordername',
prop: 'ibizordername', prop: 'ibizordername',
...@@ -68,10 +73,9 @@ export default class UIPART_0017Model { ...@@ -68,10 +73,9 @@ export default class UIPART_0017Model {
name: 'srfmstag', name: 'srfmstag',
}, },
{ {
name: 'srfkey', name: 'srfmajortext',
prop: 'ibizorderid', prop: 'ibizordername',
dataType: 'GUID', dataType: 'TEXT',
isEditable:true
}, },
{ {
name: 'srfdataaccaction', name: 'srfdataaccaction',
...@@ -79,19 +83,10 @@ export default class UIPART_0017Model { ...@@ -79,19 +83,10 @@ export default class UIPART_0017Model {
dataType: 'GUID', dataType: 'GUID',
}, },
{ {
name: 'ibizorderuid', name: 'srfkey',
prop: 'ibizorderuid', prop: 'ibizorderid',
dataType: 'PICKUP', dataType: 'GUID',
}, isEditable:true
{
name: 'srfmajortext',
prop: 'ibizordername',
dataType: 'TEXT',
},
{
name: 'updatedate',
prop: 'updatedate',
dataType: 'DATETIME',
}, },
{ {
name: 'orderuid', name: 'orderuid',
......
...@@ -74,11 +74,6 @@ export default class UIPART_0018Model { ...@@ -74,11 +74,6 @@ export default class UIPART_0018Model {
prop: 'ibizordername', prop: 'ibizordername',
dataType: 'TEXT', dataType: 'TEXT',
}, },
{
name: 'ibizorderuid',
prop: 'ibizorderuid',
dataType: 'PICKUP',
},
{ {
name: 'srfdataaccaction', name: 'srfdataaccaction',
prop: 'ibizorderid', prop: 'ibizorderid',
......
...@@ -209,13 +209,6 @@ public class IBIZOrder extends EntityMP implements Serializable { ...@@ -209,13 +209,6 @@ public class IBIZOrder extends EntityMP implements Serializable {
@JSONField(name = "ibizcustomerid") @JSONField(name = "ibizcustomerid")
@JsonProperty("ibizcustomerid") @JsonProperty("ibizcustomerid")
private String ibizcustomerid; private String ibizcustomerid;
/**
* IBIZSAMPLE0001标识
*/
@TableField(value = "ibizorderuid")
@JSONField(name = "ibizorderuid")
@JsonProperty("ibizorderuid")
private String ibizorderuid;
/** /**
* *
...@@ -225,14 +218,6 @@ public class IBIZOrder extends EntityMP implements Serializable { ...@@ -225,14 +218,6 @@ public class IBIZOrder extends EntityMP implements Serializable {
@TableField(exist = false) @TableField(exist = false)
private cn.ibizlab.core.sample.domain.IBIZCustomer ibizcustomer; private cn.ibizlab.core.sample.domain.IBIZCustomer ibizcustomer;
/**
*
*/
@JsonIgnore
@JSONField(serialize = false)
@TableField(exist = false)
private cn.ibizlab.core.sample.domain.IBIZSample0001 sampleOrder1N;
/** /**
...@@ -393,14 +378,6 @@ public class IBIZOrder extends EntityMP implements Serializable { ...@@ -393,14 +378,6 @@ public class IBIZOrder extends EntityMP implements Serializable {
this.modify("ibizcustomerid",ibizcustomerid); this.modify("ibizcustomerid",ibizcustomerid);
} }
/**
* 设置 [IBIZSAMPLE0001标识]
*/
public void setIbizorderuid(String ibizorderuid){
this.ibizorderuid = ibizorderuid ;
this.modify("ibizorderuid",ibizorderuid);
}
/** /**
* 复制当前对象数据到目标对象(粘贴重置) * 复制当前对象数据到目标对象(粘贴重置)
......
...@@ -112,13 +112,6 @@ public class IBIZOrderSearchContext extends QueryWrapperContext<IBIZOrder> { ...@@ -112,13 +112,6 @@ public class IBIZOrderSearchContext extends QueryWrapperContext<IBIZOrder> {
this.getSearchCond().eq("ibizcustomerid", n_ibizcustomerid_eq); this.getSearchCond().eq("ibizcustomerid", n_ibizcustomerid_eq);
} }
} }
private String n_ibizorderuid_eq;//[IBIZSAMPLE0001标识]
public void setN_ibizorderuid_eq(String n_ibizorderuid_eq) {
this.n_ibizorderuid_eq = n_ibizorderuid_eq;
if(!ObjectUtils.isEmpty(this.n_ibizorderuid_eq)){
this.getSearchCond().eq("ibizorderuid", n_ibizorderuid_eq);
}
}
/** /**
* 启用快速搜索 * 启用快速搜索
......
...@@ -79,6 +79,4 @@ public interface IBIZOrderMapper extends BaseMapper<IBIZOrder>{ ...@@ -79,6 +79,4 @@ public interface IBIZOrderMapper extends BaseMapper<IBIZOrder>{
List<IBIZOrder> selectByIbizcustomerid(@Param("ibizcustomerid") Serializable ibizcustomerid) ; List<IBIZOrder> selectByIbizcustomerid(@Param("ibizcustomerid") Serializable ibizcustomerid) ;
List<IBIZOrder> selectByIbizorderuid(@Param("ibizsample0001id") Serializable ibizsample0001id) ;
} }
...@@ -65,8 +65,6 @@ public interface IIBIZOrderService extends IService<IBIZOrder>{ ...@@ -65,8 +65,6 @@ public interface IIBIZOrderService extends IService<IBIZOrder>{
Page<IBIZOrder> searchXECX(IBIZOrderSearchContext context) ; Page<IBIZOrder> searchXECX(IBIZOrderSearchContext context) ;
List<IBIZOrder> selectByIbizcustomerid(String ibizcustomerid); List<IBIZOrder> selectByIbizcustomerid(String ibizcustomerid);
void removeByIbizcustomerid(String ibizcustomerid); void removeByIbizcustomerid(String ibizcustomerid);
List<IBIZOrder> selectByIbizorderuid(String ibizsample0001id);
void removeByIbizorderuid(String ibizsample0001id);
JSONObject importData(List<IBIZOrder> entities,int batchSize,boolean isIgnoreError); JSONObject importData(List<IBIZOrder> entities,int batchSize,boolean isIgnoreError);
@Async("asyncExecutor") @Async("asyncExecutor")
......
...@@ -54,9 +54,6 @@ public class IBIZOrderServiceImpl extends ServiceImpl<IBIZOrderMapper, IBIZOrder ...@@ -54,9 +54,6 @@ public class IBIZOrderServiceImpl extends ServiceImpl<IBIZOrderMapper, IBIZOrder
@Autowired @Autowired
@Lazy @Lazy
protected cn.ibizlab.core.sample.service.IIBIZCustomerService ibizcustomerService; protected cn.ibizlab.core.sample.service.IIBIZCustomerService ibizcustomerService;
@Autowired
@Lazy
protected cn.ibizlab.core.sample.service.IIBIZSample0001Service ibizsample0001Service;
protected int batchSize = 500; protected int batchSize = 500;
...@@ -254,15 +251,6 @@ public class IBIZOrderServiceImpl extends ServiceImpl<IBIZOrderMapper, IBIZOrder ...@@ -254,15 +251,6 @@ public class IBIZOrderServiceImpl extends ServiceImpl<IBIZOrderMapper, IBIZOrder
this.remove(new QueryWrapper<IBIZOrder>().eq("ibizcustomerid",ibizcustomerid)); this.remove(new QueryWrapper<IBIZOrder>().eq("ibizcustomerid",ibizcustomerid));
} }
@Override
public List<IBIZOrder> selectByIbizorderuid(String ibizsample0001id) {
return baseMapper.selectByIbizorderuid(ibizsample0001id);
}
@Override
public void removeByIbizorderuid(String ibizsample0001id) {
this.remove(new QueryWrapper<IBIZOrder>().eq("ibizorderuid",ibizsample0001id));
}
/** /**
* 查询集合 测试打印 * 查询集合 测试打印
...@@ -585,23 +573,6 @@ public class IBIZOrderServiceImpl extends ServiceImpl<IBIZOrderMapper, IBIZOrder ...@@ -585,23 +573,6 @@ public class IBIZOrderServiceImpl extends ServiceImpl<IBIZOrderMapper, IBIZOrder
} }
} }
} }
//实体关系[DER1N_IBIZORDER_IBIZSAMPLE0001_IBIZORDERUID]
if(!ObjectUtils.isEmpty(entity.getIbizorderuid())){
cn.ibizlab.core.sample.domain.IBIZSample0001 fkEntity=new cn.ibizlab.core.sample.domain.IBIZSample0001();
fkEntity.setIbizsample0001id(entity.getIbizorderuid());
if(!ibizsample0001Service.checkKey(fkEntity)){
Integer lineNum = i + 1;
errorLines.add(lineNum);
errorMsgs.add(String.format("第" + lineNum + "行:[%s]父数据有误。",entity.getIbizorderuid()));
if(isIgnoreError){
entity.setIbizorderuid(null);
continue;
}
else{
break;
}
}
}
} }
if(duplicateKeys.size()>0){ if(duplicateKeys.size()>0){
for(IBIZOrder duplicateKey:duplicateKeys){ for(IBIZOrder duplicateKey:duplicateKeys){
......
...@@ -48,9 +48,6 @@ import org.springframework.util.StringUtils; ...@@ -48,9 +48,6 @@ import org.springframework.util.StringUtils;
@Service("IBIZSample0001ServiceImpl") @Service("IBIZSample0001ServiceImpl")
public class IBIZSample0001ServiceImpl extends ServiceImpl<IBIZSample0001Mapper, IBIZSample0001> implements IIBIZSample0001Service { public class IBIZSample0001ServiceImpl extends ServiceImpl<IBIZSample0001Mapper, IBIZSample0001> implements IIBIZSample0001Service {
@Autowired
@Lazy
protected cn.ibizlab.core.sample.service.IIBIZOrderService ibizorderService;
protected int batchSize = 500; protected int batchSize = 500;
......
...@@ -179,8 +179,6 @@ ...@@ -179,8 +179,6 @@
</column> </column>
<column name="IBIZCUSTOMERID" remarks="" type="VARCHAR(100)"> <column name="IBIZCUSTOMERID" remarks="" type="VARCHAR(100)">
</column> </column>
<column name="IBIZORDERUID" remarks="" type="VARCHAR(100)">
</column>
</createTable> </createTable>
</changeSet> </changeSet>
...@@ -1052,9 +1050,6 @@ ...@@ -1052,9 +1050,6 @@
<!--输出实体[IBIZCUSTOMER_INTF]外键关系 --> <!--输出实体[IBIZCUSTOMER_INTF]外键关系 -->
<!--输出实体[IBIZHARDWARE]外键关系 --> <!--输出实体[IBIZHARDWARE]外键关系 -->
<!--输出实体[IBIZORDER]外键关系 --> <!--输出实体[IBIZORDER]外键关系 -->
<changeSet author="a_LAB01_df847bdfd" id="fk-ibizorder-30-38">
<addForeignKeyConstraint baseColumnNames="IBIZORDERUID" baseTableName="T_IBIZORDER" constraintName="DER1N_IBIZORDER_IBIZSAMPLE0001" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="IBIZSAMPLE0001ID" referencedTableName="T_IBIZSAMPLE0001" validate="true"/>
</changeSet>
<!--输出实体[IBIZORDERDETAIL]外键关系 --> <!--输出实体[IBIZORDERDETAIL]外键关系 -->
<!--输出实体[IBIZORDERTYPE]外键关系 --> <!--输出实体[IBIZORDERTYPE]外键关系 -->
<!--输出实体[IBIZQJ]外键关系 --> <!--输出实体[IBIZQJ]外键关系 -->
...@@ -1066,7 +1061,7 @@ ...@@ -1066,7 +1061,7 @@
<!--输出实体[IBIZSAMPLE0005]外键关系 --> <!--输出实体[IBIZSAMPLE0005]外键关系 -->
<!--输出实体[IBIZSAMPLE0006]外键关系 --> <!--输出实体[IBIZSAMPLE0006]外键关系 -->
<!--输出实体[IBIZSAMPLE0007]外键关系 --> <!--输出实体[IBIZSAMPLE0007]外键关系 -->
<changeSet author="a_LAB01_df847bdfd" id="fk-ibizsample0007-4-39"> <changeSet author="a_LAB01_df847bdfd" id="fk-ibizsample0007-4-38">
<addForeignKeyConstraint baseColumnNames="IBIZSAMPLE0006ID" baseTableName="T_IBIZSAMPLE0007" constraintName="DER1N_IBIZSAMPLE0007_IBIZSAMPL" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="IBIZSAMPLE0006ID" referencedTableName="T_IBIZSAMPLE0006" validate="true"/> <addForeignKeyConstraint baseColumnNames="IBIZSAMPLE0006ID" baseTableName="T_IBIZSAMPLE0007" constraintName="DER1N_IBIZSAMPLE0007_IBIZSAMPL" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="IBIZSAMPLE0006ID" referencedTableName="T_IBIZSAMPLE0006" validate="true"/>
</changeSet> </changeSet>
<!--输出实体[IBIZSAMPLE0008]外键关系 --> <!--输出实体[IBIZSAMPLE0008]外键关系 -->
...@@ -1082,7 +1077,7 @@ ...@@ -1082,7 +1077,7 @@
<!--输出实体[IBIZSAMPLE0018]外键关系 --> <!--输出实体[IBIZSAMPLE0018]外键关系 -->
<!--输出实体[IBIZSAMPLE0019]外键关系 --> <!--输出实体[IBIZSAMPLE0019]外键关系 -->
<!--输出实体[IBIZSAMPLE0020]外键关系 --> <!--输出实体[IBIZSAMPLE0020]外键关系 -->
<changeSet author="a_LAB01_df847bdfd" id="fk-ibizsample0020-4-40"> <changeSet author="a_LAB01_df847bdfd" id="fk-ibizsample0020-4-39">
<addForeignKeyConstraint baseColumnNames="IBIZSAMPLE0019ID" baseTableName="T_IBIZSAMPLE0020" constraintName="DER1N_IBIZSAMPLE0020_IBIZSAMPL" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="IBIZSAMPLE0019ID" referencedTableName="T_IBIZSAMPLE0019" validate="true"/> <addForeignKeyConstraint baseColumnNames="IBIZSAMPLE0019ID" baseTableName="T_IBIZSAMPLE0020" constraintName="DER1N_IBIZSAMPLE0020_IBIZSAMPL" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="IBIZSAMPLE0019ID" referencedTableName="T_IBIZSAMPLE0019" validate="true"/>
</changeSet> </changeSet>
<!--输出实体[IBIZSOFTWARESUIT]外键关系 --> <!--输出实体[IBIZSOFTWARESUIT]外键关系 -->
......
...@@ -1418,24 +1418,6 @@ ...@@ -1418,24 +1418,6 @@
"key_field":0, "key_field":0,
"show_order":1000, "show_order":1000,
"major_field":0 "major_field":0
},
{
"fieldname":"IBIZORDERUID" ,
"codename":"Ibizorderuid",
"field_logic_name":"IBIZSAMPLE0001标识",
"entity_name":"IBIZOrder",
"ref_de":"IBIZSAMPLE0001",
"ref_field_name":"IBIZSAMPLE0001ID",
"relation_name":"DER1N_IBIZORDER_IBIZSAMPLE0001_IBIZORDERUID",
"relation_codename":"SAMPLE_ORDER_1_N",
"field_type":"PICKUP",
"nullable":1,
"physical_field":1,
"data_type":"VARCHAR",
"data_length":100,
"key_field":0,
"show_order":1000,
"major_field":0
} }
], ],
"subEntitys":[ "subEntitys":[
...@@ -1452,12 +1434,6 @@ ...@@ -1452,12 +1434,6 @@
"code_name":"IBIZCUSTOMER", "code_name":"IBIZCUSTOMER",
"entity_name":"IBIZORDER", "entity_name":"IBIZORDER",
"ref_entity_name":"IBIZCUSTOMER" "ref_entity_name":"IBIZCUSTOMER"
},
{"name":"DER1N_IBIZORDER_IBIZSAMPLE0001_IBIZORDERUID",
"relation_type":"DER1N",
"code_name":"SAMPLE_ORDER_1_N",
"entity_name":"IBIZORDER",
"ref_entity_name":"IBIZSAMPLE0001"
} }
] ]
} }
...@@ -2828,12 +2804,6 @@ ...@@ -2828,12 +2804,6 @@
} }
], ],
"subEntitys":[ "subEntitys":[
{"name":"DER1N_IBIZORDER_IBIZSAMPLE0001_IBIZORDERUID",
"relation_type":"DER1N",
"code_name":"SAMPLE_ORDER_1_N",
"entity_name":"IBIZORDER",
"ref_entity_name":"IBIZSAMPLE0001"
}
], ],
"parentEntitys":[ "parentEntitys":[
] ]
......
...@@ -226,15 +226,6 @@ public class IBIZOrderDTO extends DTOBase implements Serializable { ...@@ -226,15 +226,6 @@ public class IBIZOrderDTO extends DTOBase implements Serializable {
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
private String ibizcustomerid; private String ibizcustomerid;
/**
* 属性 [IBIZORDERUID]
*
*/
@JSONField(name = "ibizorderuid")
@JsonProperty("ibizorderuid")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
private String ibizorderuid;
/** /**
* 设置 [TP] * 设置 [TP]
...@@ -364,14 +355,6 @@ public class IBIZOrderDTO extends DTOBase implements Serializable { ...@@ -364,14 +355,6 @@ public class IBIZOrderDTO extends DTOBase implements Serializable {
this.modify("ibizcustomerid",ibizcustomerid); this.modify("ibizcustomerid",ibizcustomerid);
} }
/**
* 设置 [IBIZORDERUID]
*/
public void setIbizorderuid(String ibizorderuid){
this.ibizorderuid = ibizorderuid ;
this.modify("ibizorderuid",ibizorderuid);
}
} }
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册