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

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

上级 3bd9d884
......@@ -23,6 +23,7 @@ export default {
memo: "备注",
ibizcustomername: "客户名称",
ibizcustomerid: "客户标识",
ibizorderuid: "IBIZSAMPLE0001标识",
},
views: {
wfactionview: {
......
......@@ -22,6 +22,7 @@ export default {
memo: "备注",
ibizcustomername: "客户名称",
ibizcustomerid: "客户标识",
ibizorderuid: "IBIZSAMPLE0001标识",
},
views: {
wfactionview: {
......
......@@ -81,6 +81,9 @@ export default class DefaultModel {
{
name: 'ibizcustomerid',
},
{
name: 'ibizorderuid',
},
]
}
......
......@@ -81,6 +81,9 @@ export default class DefaultModel {
{
name: 'ibizcustomerid',
},
{
name: 'ibizorderuid',
},
]
}
......
......@@ -114,6 +114,11 @@ export default class MainModel {
prop: 'ibizordername',
dataType: 'TEXT',
},
{
name: 'ibizorderuid',
prop: 'ibizorderuid',
dataType: 'PICKUP',
},
{
name: 'srfdataaccaction',
prop: 'ibizorderid',
......
......@@ -2381,13 +2381,13 @@ export default class Main2Base extends Vue implements ControlInterface {
this.data['orderstate'] = '10';
}
if (this.data.hasOwnProperty('f1')) {
this.data['f1'] = this.viewparams['https://www.baidu.com/'];
this.data['f1'] = this.viewparams[''];
}
if (this.data.hasOwnProperty('f2')) {
this.data['f2'] = this.context['10'];
this.data['f2'] = this.context['srfusername'];
}
if (this.data.hasOwnProperty('f3')) {
this.data['f3'] = this.context['ORDERTIME'];
this.data['f3'] = this.context['srfusername'];
}
if (this.data.hasOwnProperty('f4')) {
this.data['f4'] = this.context['srfusername'];
......
......@@ -81,6 +81,9 @@ export default class ODSP_WFExpViewexpbarModel {
{
name: 'ibizcustomerid',
},
{
name: 'ibizorderuid',
},
]
}
......
......@@ -81,6 +81,9 @@ export default class PickupViewpickupviewpanelModel {
{
name: 'ibizcustomerid',
},
{
name: 'ibizorderuid',
},
]
}
......
......@@ -74,6 +74,11 @@ export default class UIPART_0015Model {
prop: 'ibizordername',
dataType: 'TEXT',
},
{
name: 'ibizorderuid',
prop: 'ibizorderuid',
dataType: 'PICKUP',
},
{
name: 'srfdataaccaction',
prop: 'ibizorderid',
......
......@@ -59,11 +59,6 @@ export default class UIPART_0017Model {
dataType: 'DATE',
isEditable:true
},
{
name: 'updatedate',
prop: 'updatedate',
dataType: 'DATETIME',
},
{
name: 'ibizordername',
prop: 'ibizordername',
......@@ -73,9 +68,10 @@ export default class UIPART_0017Model {
name: 'srfmstag',
},
{
name: 'srfmajortext',
prop: 'ibizordername',
dataType: 'TEXT',
name: 'srfkey',
prop: 'ibizorderid',
dataType: 'GUID',
isEditable:true
},
{
name: 'srfdataaccaction',
......@@ -83,10 +79,19 @@ export default class UIPART_0017Model {
dataType: 'GUID',
},
{
name: 'srfkey',
prop: 'ibizorderid',
dataType: 'GUID',
isEditable:true
name: 'ibizorderuid',
prop: 'ibizorderuid',
dataType: 'PICKUP',
},
{
name: 'srfmajortext',
prop: 'ibizordername',
dataType: 'TEXT',
},
{
name: 'updatedate',
prop: 'updatedate',
dataType: 'DATETIME',
},
{
name: 'orderuid',
......
......@@ -74,6 +74,11 @@ export default class UIPART_0018Model {
prop: 'ibizordername',
dataType: 'TEXT',
},
{
name: 'ibizorderuid',
prop: 'ibizorderuid',
dataType: 'PICKUP',
},
{
name: 'srfdataaccaction',
prop: 'ibizorderid',
......
......@@ -209,6 +209,13 @@ public class IBIZOrder extends EntityMP implements Serializable {
@JSONField(name = "ibizcustomerid")
@JsonProperty("ibizcustomerid")
private String ibizcustomerid;
/**
* IBIZSAMPLE0001标识
*/
@TableField(value = "ibizorderuid")
@JSONField(name = "ibizorderuid")
@JsonProperty("ibizorderuid")
private String ibizorderuid;
/**
*
......@@ -218,6 +225,14 @@ public class IBIZOrder extends EntityMP implements Serializable {
@TableField(exist = false)
private cn.ibizlab.core.sample.domain.IBIZCustomer ibizcustomer;
/**
*
*/
@JsonIgnore
@JSONField(serialize = false)
@TableField(exist = false)
private cn.ibizlab.core.sample.domain.IBIZSample0001 sampleOrder1N;
/**
......@@ -378,6 +393,14 @@ public class IBIZOrder extends EntityMP implements Serializable {
this.modify("ibizcustomerid",ibizcustomerid);
}
/**
* 设置 [IBIZSAMPLE0001标识]
*/
public void setIbizorderuid(String ibizorderuid){
this.ibizorderuid = ibizorderuid ;
this.modify("ibizorderuid",ibizorderuid);
}
/**
* 复制当前对象数据到目标对象(粘贴重置)
......
......@@ -112,6 +112,13 @@ public class IBIZOrderSearchContext extends QueryWrapperContext<IBIZOrder> {
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,4 +79,6 @@ public interface IBIZOrderMapper extends BaseMapper<IBIZOrder>{
List<IBIZOrder> selectByIbizcustomerid(@Param("ibizcustomerid") Serializable ibizcustomerid) ;
List<IBIZOrder> selectByIbizorderuid(@Param("ibizsample0001id") Serializable ibizsample0001id) ;
}
......@@ -65,6 +65,8 @@ public interface IIBIZOrderService extends IService<IBIZOrder>{
Page<IBIZOrder> searchXECX(IBIZOrderSearchContext context) ;
List<IBIZOrder> selectByIbizcustomerid(String ibizcustomerid);
void removeByIbizcustomerid(String ibizcustomerid);
List<IBIZOrder> selectByIbizorderuid(String ibizsample0001id);
void removeByIbizorderuid(String ibizsample0001id);
JSONObject importData(List<IBIZOrder> entities,int batchSize,boolean isIgnoreError);
@Async("asyncExecutor")
......
......@@ -54,6 +54,9 @@ public class IBIZOrderServiceImpl extends ServiceImpl<IBIZOrderMapper, IBIZOrder
@Autowired
@Lazy
protected cn.ibizlab.core.sample.service.IIBIZCustomerService ibizcustomerService;
@Autowired
@Lazy
protected cn.ibizlab.core.sample.service.IIBIZSample0001Service ibizsample0001Service;
protected int batchSize = 500;
......@@ -251,6 +254,15 @@ public class IBIZOrderServiceImpl extends ServiceImpl<IBIZOrderMapper, IBIZOrder
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));
}
/**
* 查询集合 测试打印
......@@ -573,6 +585,23 @@ 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){
for(IBIZOrder duplicateKey:duplicateKeys){
......
......@@ -48,6 +48,9 @@ import org.springframework.util.StringUtils;
@Service("IBIZSample0001ServiceImpl")
public class IBIZSample0001ServiceImpl extends ServiceImpl<IBIZSample0001Mapper, IBIZSample0001> implements IIBIZSample0001Service {
@Autowired
@Lazy
protected cn.ibizlab.core.sample.service.IIBIZOrderService ibizorderService;
protected int batchSize = 500;
......
......@@ -179,6 +179,8 @@
</column>
<column name="IBIZCUSTOMERID" remarks="" type="VARCHAR(100)">
</column>
<column name="IBIZORDERUID" remarks="" type="VARCHAR(100)">
</column>
</createTable>
</changeSet>
......@@ -1050,6 +1052,9 @@
<!--输出实体[IBIZCUSTOMER_INTF]外键关系 -->
<!--输出实体[IBIZHARDWARE]外键关系 -->
<!--输出实体[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]外键关系 -->
<!--输出实体[IBIZORDERTYPE]外键关系 -->
<!--输出实体[IBIZQJ]外键关系 -->
......@@ -1061,7 +1066,7 @@
<!--输出实体[IBIZSAMPLE0005]外键关系 -->
<!--输出实体[IBIZSAMPLE0006]外键关系 -->
<!--输出实体[IBIZSAMPLE0007]外键关系 -->
<changeSet author="a_LAB01_df847bdfd" id="fk-ibizsample0007-4-38">
<changeSet author="a_LAB01_df847bdfd" id="fk-ibizsample0007-4-39">
<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>
<!--输出实体[IBIZSAMPLE0008]外键关系 -->
......@@ -1077,7 +1082,7 @@
<!--输出实体[IBIZSAMPLE0018]外键关系 -->
<!--输出实体[IBIZSAMPLE0019]外键关系 -->
<!--输出实体[IBIZSAMPLE0020]外键关系 -->
<changeSet author="a_LAB01_df847bdfd" id="fk-ibizsample0020-4-39">
<changeSet author="a_LAB01_df847bdfd" id="fk-ibizsample0020-4-40">
<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>
<!--输出实体[IBIZSOFTWARESUIT]外键关系 -->
......
......@@ -1418,6 +1418,24 @@
"key_field":0,
"show_order":1000,
"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":[
......@@ -1434,6 +1452,12 @@
"code_name":"IBIZCUSTOMER",
"entity_name":"IBIZORDER",
"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"
}
]
}
......@@ -2804,6 +2828,12 @@
}
],
"subEntitys":[
{"name":"DER1N_IBIZORDER_IBIZSAMPLE0001_IBIZORDERUID",
"relation_type":"DER1N",
"code_name":"SAMPLE_ORDER_1_N",
"entity_name":"IBIZORDER",
"ref_entity_name":"IBIZSAMPLE0001"
}
],
"parentEntitys":[
]
......
......@@ -226,6 +226,15 @@ public class IBIZOrderDTO extends DTOBase implements Serializable {
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
private String ibizcustomerid;
/**
* 属性 [IBIZORDERUID]
*
*/
@JSONField(name = "ibizorderuid")
@JsonProperty("ibizorderuid")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
private String ibizorderuid;
/**
* 设置 [TP]
......@@ -355,6 +364,14 @@ public class IBIZOrderDTO extends DTOBase implements Serializable {
this.modify("ibizcustomerid",ibizcustomerid);
}
/**
* 设置 [IBIZORDERUID]
*/
public void setIbizorderuid(String ibizorderuid){
this.ibizorderuid = ibizorderuid ;
this.modify("ibizorderuid",ibizorderuid);
}
}
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册