yunxi
/
jigangSCM2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

工厂基地建模

Browse Source
jg-waiwang-pro
XI_TENG\xixi_ 6 months ago
parent ad2b2f4b96
commit e89a5a924f
7 changed files with 77 additions and 77 deletions
Show Stats Download Patch File Download Diff File

4
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/BusinessLine3Service.java
Unescape View File

@ -27,9 +27,9 @@ public interface BusinessLine3Service extends IService<BusinessLine3Entity> {
boolean update(String id, BusinessLine3Entity entity);
//子表方法
List<BusinessLineContact3Entity> getBusinessLineContact3List(String id,BusinessLine3Pagination businessLine3Pagination);
List<BusinessContact3Entity> getBusinessContact3List(String id,BusinessLine3Pagination businessLine3Pagination);
List<BusinessLineContact3Entity> getBusinessLineContact3List(String id);
List<BusinessContact3Entity> getBusinessContact3List(String id);
//副表数据方法
String checkForm(BusinessLine3Form form,int i);

114
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BusinessLine3ServiceImpl.java
Unescape View File

@ -47,7 +47,7 @@ public class BusinessLine3ServiceImpl extends ServiceImpl<BusinessLine3Mapper, B
private UserProvider userProvider;
@Autowired
private BusinessLineContact3Service businessLineContact3Service;
private BusinessContact3Service businessContact3Service;
@Override
public List<BusinessLine3Entity> getList(BusinessLine3Pagination businessLine3Pagination){
return getTypeList(businessLine3Pagination,businessLine3Pagination.getDataType());
@ -66,9 +66,9 @@ public class BusinessLine3ServiceImpl extends ServiceImpl<BusinessLine3Mapper, B
int total=0;
int businessLine3Num =0;
QueryWrapper<BusinessLine3Entity> businessLine3QueryWrapper=new QueryWrapper<>();
int businessLineContact3Num =0;
QueryWrapper<BusinessLineContact3Entity> businessLineContact3QueryWrapper=new QueryWrapper<>();
long businessLineContact3count = businessLineContact3Service.count();
int businessContact3Num =0;
QueryWrapper<BusinessContact3Entity> businessContact3QueryWrapper=new QueryWrapper<>();
long businessContact3count = businessContact3Service.count();
List<String> allSuperIDlist = new ArrayList<>();
String superOp ="";
if (ObjectUtil.isNotEmpty(businessLine3Pagination.getSuperQueryJson())){
@ -86,12 +86,12 @@ public class BusinessLine3ServiceImpl extends ServiceImpl<BusinessLine3Mapper, B
intersectionSuperList.add(businessLine3List);
superNum++;
}
String businessLineContact3Table = "jg_business_contact";
boolean businessLineContact3HasSql = queryJson.contains(businessLineContact3Table);
List<String> businessLineContact3List = generaterSwapUtil.selectIdsByChildCondition(BusinessLine3Constant.getTableList(), businessLineContact3Table , queryJson, null);
if (businessLineContact3HasSql){
allSuperList.addAll(businessLineContact3List);
intersectionSuperList.add(businessLineContact3List);
String businessContact3Table = "jg_business_contact";
boolean businessContact3HasSql = queryJson.contains(businessContact3Table);
List<String> businessContact3List = generaterSwapUtil.selectIdsByChildCondition(BusinessLine3Constant.getTableList(), businessContact3Table , queryJson, null);
if (businessContact3HasSql){
allSuperList.addAll(businessContact3List);
intersectionSuperList.add(businessContact3List);
superNum++;
}
superOp = superNum > 0 ? superJsonModel.getMatchLogic() : "";
@ -118,12 +118,12 @@ public class BusinessLine3ServiceImpl extends ServiceImpl<BusinessLine3Mapper, B
intersectionRuleList.add(businessLine3List);
ruleNum++;
}
String businessLineContact3Table = "jg_business_contact";
boolean businessLineContact3HasSql = ruleJson.contains(businessLineContact3Table);
List<String> businessLineContact3List = generaterSwapUtil.selectIdsByChildCondition(BusinessLine3Constant.getTableList(), businessLineContact3Table , ruleJson, null);
if (businessLineContact3HasSql){
allRuleList.addAll(businessLineContact3List);
intersectionRuleList.add(businessLineContact3List);
String businessContact3Table = "jg_business_contact";
boolean businessContact3HasSql = ruleJson.contains(businessContact3Table);
List<String> businessContact3List = generaterSwapUtil.selectIdsByChildCondition(BusinessLine3Constant.getTableList(), businessContact3Table , ruleJson, null);
if (businessContact3HasSql){
allRuleList.addAll(businessContact3List);
intersectionRuleList.add(businessContact3List);
ruleNum++;
}
ruleOp = ruleNum > 0 ? ruleJsonModel.getMatchLogic() : "";
@ -147,13 +147,13 @@ public class BusinessLine3ServiceImpl extends ServiceImpl<BusinessLine3Mapper, B
businessLine3Num++;
}
}
Object businessLineContact3Obj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(businessLineContact3QueryWrapper,BusinessLineContact3Entity.class,businessLine3Pagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(businessLineContact3Obj)){
Object businessContact3Obj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(businessContact3QueryWrapper,BusinessContact3Entity.class,businessLine3Pagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(businessContact3Obj)){
return new ArrayList<>();
} else {
businessLineContact3QueryWrapper = (QueryWrapper<BusinessLineContact3Entity>)businessLineContact3Obj;
if( businessLineContact3QueryWrapper.getExpression().getNormal().size()>0){
businessLineContact3Num++;
businessContact3QueryWrapper = (QueryWrapper<BusinessContact3Entity>)businessContact3Obj;
if( businessContact3QueryWrapper.getExpression().getNormal().size()>0){
businessContact3Num++;
}
}
}
@ -171,13 +171,13 @@ public class BusinessLine3ServiceImpl extends ServiceImpl<BusinessLine3Mapper, B
}
Object businessLineContact3Obj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(businessLineContact3QueryWrapper,BusinessLineContact3Entity.class,businessLine3Pagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(businessLineContact3Obj)){
Object businessContact3Obj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(businessContact3QueryWrapper,BusinessContact3Entity.class,businessLine3Pagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(businessContact3Obj)){
return new ArrayList<>();
} else {
businessLineContact3QueryWrapper = (QueryWrapper<BusinessLineContact3Entity>)businessLineContact3Obj;
if( businessLineContact3QueryWrapper.getExpression().getNormal().size()>0){
businessLineContact3Num++;
businessContact3QueryWrapper = (QueryWrapper<BusinessContact3Entity>)businessContact3Obj;
if( businessContact3QueryWrapper.getExpression().getNormal().size()>0){
businessContact3Num++;
}
}
@ -247,15 +247,15 @@ public class BusinessLine3ServiceImpl extends ServiceImpl<BusinessLine3Mapper, B
}
}
if(businessLineContact3Num>0){
List<String> businessLineContact3IdList = businessLineContact3Service.list(businessLineContact3QueryWrapper).stream().filter(t->StringUtil.isNotEmpty(t.getBusinessLineId())).map(t->t.getBusinessLineId()).collect(Collectors.toList());
long count = businessLineContact3Service.count();
if(businessContact3Num>0){
List<String> businessContact3IdList = businessContact3Service.list(businessContact3QueryWrapper).stream().filter(t->StringUtil.isNotEmpty(t.getBusinessLineId())).map(t->t.getBusinessLineId()).collect(Collectors.toList());
long count = businessContact3Service.count();
if (count>0){
intersectionList.add(businessLineContact3IdList);
intersectionList.add(businessContact3IdList);
}
AllIdList.addAll(businessLineContact3IdList);
AllIdList.addAll(businessContact3IdList);
}
total+=businessLineContact3Num;
total+=businessContact3Num;
List<String> intersection = generaterSwapUtil.getIntersection(intersectionList);
if (total>0){
if (intersection.size()==0){
@ -332,26 +332,26 @@ public class BusinessLine3ServiceImpl extends ServiceImpl<BusinessLine3Mapper, B
this.removeById(entity.getId());
}
}
/** BusinessLineContact3子表方法 */
/** BusinessContact3子表方法 */
@Override
public List<BusinessLineContact3Entity> getBusinessLineContact3List(String id,BusinessLine3Pagination businessLine3Pagination){
public List<BusinessContact3Entity> getBusinessContact3List(String id,BusinessLine3Pagination businessLine3Pagination){
Map<String, Object> newtabMap=BusinessLine3Constant.TABLEFIELDKEY.entrySet()
.stream().collect( Collectors.toMap(e->e.getValue(),e->e.getKey()));
String tableName="businessLineContact3";
String tableName="businessContact3";
tableName=newtabMap.get(tableName)==null?tableName:newtabMap.get(tableName).toString();
QueryWrapper<BusinessLineContact3Entity> queryWrapper = new QueryWrapper<>();
queryWrapper = businessLineContact3Service.getChild(businessLine3Pagination,queryWrapper);
queryWrapper.lambda().eq(BusinessLineContact3Entity::getBusinessLineId, id);
generaterSwapUtil.wrapperHandle(BusinessLine3Constant.getColumnData(), BusinessLine3Constant.getAppColumnData(), queryWrapper,BusinessLineContact3Entity.class,"sub",tableName);
return businessLineContact3Service.list(queryWrapper);
QueryWrapper<BusinessContact3Entity> queryWrapper = new QueryWrapper<>();
queryWrapper = businessContact3Service.getChild(businessLine3Pagination,queryWrapper);
queryWrapper.lambda().eq(BusinessContact3Entity::getBusinessLineId, id);
generaterSwapUtil.wrapperHandle(BusinessLine3Constant.getColumnData(), BusinessLine3Constant.getAppColumnData(), queryWrapper,BusinessContact3Entity.class,"sub",tableName);
return businessContact3Service.list(queryWrapper);
}
/** BusinessLineContact3子表方法 */
/** BusinessContact3子表方法 */
@Override
public List<BusinessLineContact3Entity> getBusinessLineContact3List(String id){
QueryWrapper<BusinessLineContact3Entity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(BusinessLineContact3Entity::getBusinessLineId, id);
return businessLineContact3Service.list(queryWrapper);
public List<BusinessContact3Entity> getBusinessContact3List(String id){
QueryWrapper<BusinessContact3Entity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(BusinessContact3Entity::getBusinessLineId, id);
return businessContact3Service.list(queryWrapper);
}
/** 验证表单唯一字段，正则，非空 i-0新增-1修改*/
@Override
@ -380,8 +380,8 @@ public class BusinessLine3ServiceImpl extends ServiceImpl<BusinessLine3Mapper, B
}
}
//子表字段验证
if (form.getBusinessLineContact3List()!=null){
for(BusinessLineContact3Model t : form.getBusinessLineContact3List()){
if (form.getBusinessContact3List()!=null){
for(BusinessContact3Model t : form.getBusinessContact3List()){
if(StringUtil.isNotEmpty(t.getName())){
t.setName(t.getName().trim());
}
@ -389,7 +389,7 @@ public class BusinessLine3ServiceImpl extends ServiceImpl<BusinessLine3Mapper, B
return "-姓名不能为空";
}
}
for(BusinessLineContact3Model t : form.getBusinessLineContact3List()){
for(BusinessContact3Model t : form.getBusinessContact3List()){
if(StringUtil.isNotEmpty(t.getPhone())){
t.setPhone(t.getPhone().trim());
}
@ -397,7 +397,7 @@ public class BusinessLine3ServiceImpl extends ServiceImpl<BusinessLine3Mapper, B
return "-手机号不能为空";
}
}
for(BusinessLineContact3Model t : form.getBusinessLineContact3List()){
for(BusinessContact3Model t : form.getBusinessContact3List()){
if(StringUtil.isNotEmpty(t.getEmail())){
t.setEmail(t.getEmail().trim());
}
@ -435,21 +435,21 @@ public class BusinessLine3ServiceImpl extends ServiceImpl<BusinessLine3Mapper, B
}
this.saveOrUpdate(entity);
//BusinessLineContact3子表数据新增修改
//BusinessContact3子表数据新增修改
if(!isSave){
QueryWrapper<BusinessLineContact3Entity> BusinessLineContact3queryWrapper = new QueryWrapper<>();
BusinessLineContact3queryWrapper.lambda().eq(BusinessLineContact3Entity::getBusinessLineId, entity.getId());
businessLineContact3Service.remove(BusinessLineContact3queryWrapper);
QueryWrapper<BusinessContact3Entity> BusinessContact3queryWrapper = new QueryWrapper<>();
BusinessContact3queryWrapper.lambda().eq(BusinessContact3Entity::getBusinessLineId, entity.getId());
businessContact3Service.remove(BusinessContact3queryWrapper);
}
if (businessLine3Form.getBusinessLineContact3List()!=null){
List<BusinessLineContact3Entity> tableField133 = JsonUtil.getJsonToList(businessLine3Form.getBusinessLineContact3List(),BusinessLineContact3Entity.class);
for(BusinessLineContact3Entity entitys : tableField133){
if (businessLine3Form.getBusinessContact3List()!=null){
List<BusinessContact3Entity> tableField133 = JsonUtil.getJsonToList(businessLine3Form.getBusinessContact3List(),BusinessContact3Entity.class);
for(BusinessContact3Entity entitys : tableField133){
entitys.setId(RandomUtil.uuId());
entitys.setBusinessLineId(entity.getId());
if(isSave){
}else{
}
businessLineContact3Service.saveOrUpdate(entitys);
businessContact3Service.saveOrUpdate(entitys);
}
}
}

18
jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessLine3Controller.java
Unescape View File

@ -72,7 +72,7 @@ public class BusinessLine3Controller {
private BusinessLine3Service businessLine3Service;
@Autowired
private BusinessLineContact3Service businessLineContact3Service;
private BusinessContact3Service businessContact3Service;
@Autowired
@ -94,8 +94,8 @@ public class BusinessLine3Controller {
businessLine3Map.put("id", businessLine3Map.get("id"));
//副表数据
//子表数据
List<BusinessLineContact3Entity> businessLineContact3List = businessLine3Service.getBusinessLineContact3List(entity.getId(),businessLine3Pagination);
businessLine3Map.put("tableField133",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(businessLineContact3List)));
List<BusinessContact3Entity> businessContact3List = businessLine3Service.getBusinessContact3List(entity.getId(),businessLine3Pagination);
businessLine3Map.put("tableField133",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(businessContact3List)));
realList.add(businessLine3Map);
}
//数据转换
@ -166,8 +166,8 @@ public class BusinessLine3Controller {
businessLine3Map.put("id", businessLine3Map.get("id"));
//副表数据
//子表数据
List<BusinessLineContact3Entity> businessLineContact3List = businessLine3Service.getBusinessLineContact3List(entity.getId(),businessLine3Pagination);
businessLine3Map.put("tableField133",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(businessLineContact3List)));
List<BusinessContact3Entity> businessContact3List = businessLine3Service.getBusinessContact3List(entity.getId(),businessLine3Pagination);
businessLine3Map.put("tableField133",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(businessContact3List)));
realList.add(businessLine3Map);
}
//数据转换
@ -579,8 +579,8 @@ uniqueModel.setFlowId(visualImportModel.getFlowId()); ExcelImportModel e
businessLine3Map.put("id", businessLine3Map.get("id"));
//副表数据
//子表数据
List<BusinessLineContact3Entity> businessLineContact3List = businessLine3Service.getBusinessLineContact3List(entity.getId());
businessLine3Map.put("tableField133",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(businessLineContact3List)));
List<BusinessContact3Entity> businessContact3List = businessLine3Service.getBusinessContact3List(entity.getId());
businessLine3Map.put("tableField133",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(businessContact3List)));
businessLine3Map = generaterSwapUtil.swapDataDetail(businessLine3Map,BusinessLine3Constant.getFormData(),"521949393889270917",false);
return ActionResult.success(businessLine3Map);
}
@ -601,8 +601,8 @@ uniqueModel.setFlowId(visualImportModel.getFlowId()); ExcelImportModel e
businessLine3Map.put("id", businessLine3Map.get("id"));
//副表数据
//子表数据
List<BusinessLineContact3Entity> businessLineContact3List = businessLine3Service.getBusinessLineContact3List(entity.getId());
businessLine3Map.put("businessLineContact3List",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(businessLineContact3List)));
List<BusinessContact3Entity> businessContact3List = businessLine3Service.getBusinessContact3List(entity.getId());
businessLine3Map.put("businessContactList",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(businessContact3List)));
businessLine3Map = generaterSwapUtil.swapDataForm(businessLine3Map,BusinessLine3Constant.getFormData(),BusinessLine3Constant.TABLEFIELDKEY,BusinessLine3Constant.TABLERENAMES);
return ActionResult.success(businessLine3Map);
}

10
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/businessline3/BusinessLine3Constant.java
View File

File diff suppressed because one or more lines are too long

2
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/businessline3/BusinessLine3ExcelVO.java
Unescape View File

@ -24,7 +24,7 @@ public class BusinessLine3ExcelVO{
@JsonProperty("tableField133")
@ExcelCollection(name="",orderNum = "0")
private List<BusinessLineContact3ExcelVO> tableField133;
private List<BusinessContact3ExcelVO> tableField133;
}

4
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/businessline3/BusinessLine3Form.java
Unescape View File

@ -17,8 +17,8 @@ public class BusinessLine3Form {
/** 主键 */
private String id;
/** 子表数据 **/
@JsonProperty("businessLineContact3List")
private List<BusinessLineContact3Model> businessLineContact3List;
@JsonProperty("businessContact3List")
private List<BusinessContact3Model> businessContact3List;
/** 乐观锁 **/
@JsonProperty("version")
private Integer version;

2
jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingstorage/form.vue
Unescape View File

@ -730,7 +730,7 @@ export default {
},
],
},
warehousingStorageTypeOptions: [{ "fullName": "采购入库", "id": "1" }, { "fullName": "调拨入库", "id": "2" }, { "fullName": "退货入库", "id": "3" }, { "fullName": "盘盈入库", "id": "4" }, { "fullName": "其他入库", "id": "5" }, { "fullName": "差异调整入库", "id": "6" }, { "fullName": "领用返库入库", "id": "7" }, { "fullName": "货权转移入库", "id": "8" }, { "fullName": "加工入库", "id": "9" }, { "fullName": "其他出库", "id": "10" }, { "fullName": "库存初始化", "id": "11" }, { "fullName": "调拨出库撤回", "id": "12" }, { "fullName": "其他出库撤回", "id": "13" }],
warehousingStorageTypeOptions: [{ "fullName": "采购入库", "id": "1" }, { "fullName": "调拨入库", "id": "2" }, { "fullName": "退货入库", "id": "3" }, { "fullName": "盘盈入库", "id": "4" }, { "fullName": "其他入库", "id": "5" }, { "fullName": "差异调整入库", "id": "6" }, { "fullName": "领用返库入库", "id": "7" }, { "fullName": "货权转移入库", "id": "8" }, { "fullName": "加工入库", "id": "9" }, { "fullName": "其他出库", "id": "10" }, { "fullName": "库存初始化", "id": "11" }, { "fullName": "调拨出库撤回", "id": "12" }, { "fullName": "其他出库撤回", "id": "13" }, { "fullName": "采购收货单入库", "id": "15" }, { "fullName": "销售收货单入库", "id": "16" }],
warehousingStorageTypeProps: { "label": "fullName", "value": "id" },
warehousingIdcolumnOptions: [{ "label": "通知编号", "value": "warehousing_code" }, { "label": "供应商名称", "value": "subjectName" }, { "label": "仓库名称", "value": "businessName" },],
warehousingIdcolumnOptions4: [{ "label": "通知编号", "value": "documentNo" }, { "label": "供应商名称", "value": "document_no" }, { "label": "仓库名称", "value": "businessName" },],

Write Preview
Loading…
Cancel
Save