|
@@ -1147,6 +1147,11 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
|
|
|
public R checkAndSaveOrUpdateBlank(CheckAndSaveOrUpdateBlankReq req) {
|
|
|
//获取坯料计划内容
|
|
|
ApsBlankOrderDo apsBlankOrderDo = req.getApsBlankOrderDo();
|
|
|
+ //获取当前用户信息
|
|
|
+ //获取当前用户的所属工厂
|
|
|
+ SysUserVo currentUser = CXCommonUtils.getCurrentUser();
|
|
|
+ String tenantId = currentUser.getOrganizationDoList().get(0).getFullpid().split(",")[1];
|
|
|
+
|
|
|
|
|
|
//=============校验坯料长度=================
|
|
|
//如果坯料产品类型对应产品外观类型是铝板或板锭,并且坯料长度为空,则提示:坯料是铝板和板锭时长度必填
|
|
@@ -1305,9 +1310,11 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
|
|
|
}
|
|
|
|
|
|
//更新或保存坯料计划和输出成品
|
|
|
+ apsBlankOrderDo.setTenantid(tenantId);
|
|
|
this.saveOrUpdate(apsBlankOrderDo);
|
|
|
for (ApsProcessOutputProductDo apsProcessOutputProductDo : apsProcessOutputProductDoList) {
|
|
|
apsProcessOutputProductDo.setBlankid(apsBlankOrderDo.getId());
|
|
|
+ apsProcessOutputProductDo.setTenantid(tenantId);
|
|
|
}
|
|
|
apsProcessOutputProductService.saveOrUpdateBatch(apsProcessOutputProductDoList);
|
|
|
|