CaiXiang/cigs4
1
0
Förgrening 0
Kod Ärenden Pull-förfrågningar Släpp Wiki Aktiviteter

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

Bläddra i källkod 
Reviewed-on: #20
This commit is contained in:
闫阳 2023-03-07 12:12:58 +08:00
förälder e35c2f4c45 6fe5b71e49
incheckning c9ddb770e1
2 ändrade filer med 3 tillägg och 1 borttagningar
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ym-admin/src/main/java/com/cnbm/admin/utils/BaseSupportUtils.java
Visa fil

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

2
ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxServiceBizImpl.java
Visa fil

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