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

Merge pull request 'm' (#20) from yanyang into master

Browse Source 
Reviewed-on: #20
This commit is contained in:
闫阳
2023-03-07 12:12:58 +08:00
parent e35c2f4c45 6fe5b71e49
commit c9ddb770e1
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File 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, "enabled", "valid"); BeanUtils.copyProperties(commonField, t, "valid");
return t; return t;
} }

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

@@ -178,6 +178,8 @@ 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);
} }