CaiXiang/cigs4
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: CaiXiang:c9ddb770e1fbd3620b2432efd433fcdad7400af9
Branches Tags
CaiXiang:master
CaiXiang:yanyang
CaiXiang:cicd
CaiXiang:dynamicDs
..
compare: CaiXiang:e35c2f4c45a50dbe4d9af0db2f6c9e08db8b5c1f
Branches Tags
CaiXiang:master
CaiXiang:yanyang
CaiXiang:cicd
CaiXiang:dynamicDs

No commits in common. "c9ddb770e1fbd3620b2432efd433fcdad7400af9" and "e35c2f4c45a50dbe4d9af0db2f6c9e08db8b5c1f" have entirely different histories.
c9ddb770e1 ... e35c2f4c45

2 changed files with 1 additions and 3 deletions
Show Stats Expand all files Collapse all files

2
ym-admin/src/main/java/com/cnbm/admin/utils/BaseSupportUtils.java
View File

@ -89,7 +89,7 @@ public abstract class BaseSupportUtils {
.updaterName(getLoginUser().getUsername()) .updaterName(getLoginUser().getUsername())
.updateTime(LocalDateTime.now()) .updateTime(LocalDateTime.now())
.build(); .build();
BeanUtils.copyProperties(commonField, t, "valid"); BeanUtils.copyProperties(commonField, t, "enabled", "valid");
return t; return t;
} }

2
ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxServiceBizImpl.java
View File

@ -178,8 +178,6 @@ public class WoPackagingBoxServiceBizImpl extends CrudServiceImpl<WoPackagingBox
for(WoPackagingBoxSubstrate substrate : substrateList){ for(WoPackagingBoxSubstrate substrate : substrateList){
substrate.setPackagingBoxId(box.getBoxNo()); substrate.setPackagingBoxId(box.getBoxNo());
substrate.setPowerLevel(box.getPowerLevel()); substrate.setPowerLevel(box.getPowerLevel());
substrate.setSapMaterial(box.getSapMaterial());
substrate.setLineBody(box.getLineBody());
BaseSupportUtils.setCommonField(substrate); BaseSupportUtils.setCommonField(substrate);
woPackagingBoxSubstrateServiceBiz.insert(substrate); woPackagingBoxSubstrateServiceBiz.insert(substrate);
} }