|
@@ -146,9 +146,12 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
|
|
|
syShippingOrder.setCreateTime(new Date());
|
|
|
//设置创建人
|
|
|
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
- if(org.jeecg.modules.system.util.oConvertUtils.isEmpty(sysUser)){
|
|
|
+ if(oConvertUtils.isNotEmpty(syShippingOrder.getCreateBy())){
|
|
|
+ sysUser.setRealname(syShippingOrder.getCreateBy());
|
|
|
+ }
|
|
|
+ if(oConvertUtils.isEmpty(sysUser)){
|
|
|
syShippingOrder.setCreateBy("admin");
|
|
|
- }else {
|
|
|
+ }else{
|
|
|
syShippingOrder.setCreateBy(sysUser.getRealname());
|
|
|
}
|
|
|
//成衣或者面料
|
|
@@ -476,6 +479,9 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
|
|
|
syShippingOrder.setDelFlag("1");
|
|
|
updateById(syShippingOrder);
|
|
|
|
|
|
+ //获取制单人
|
|
|
+ syShippingOrderEdit.setCreateBy(syShippingOrder.getCreateBy());
|
|
|
+
|
|
|
//新增主表
|
|
|
syShippingOrderAdd(syShippingOrderEdit);
|
|
|
return syShippingOrder;
|