Browse Source

2024-10-13

优化
master
fengyuan_yang 1 year ago
parent
commit
d72227151e
  1. 5
      src/main/java/com/spring/modules/Tooling/service/impl/ProjectToolingApplyServiceImpl.java
  2. 2
      src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml
  3. 3
      src/main/resources/mapper/change/ChangeManagementMapper.xml

5
src/main/java/com/spring/modules/Tooling/service/impl/ProjectToolingApplyServiceImpl.java

@ -38,6 +38,7 @@ import com.spring.modules.request.vo.PlmRequestDetailVo;
import com.spring.modules.request.vo.PlmRequestHeaderVo; import com.spring.modules.request.vo.PlmRequestHeaderVo;
import com.spring.modules.sys.dao.SysUserDao; import com.spring.modules.sys.dao.SysUserDao;
import com.spring.modules.sys.entity.SysUserEntity; import com.spring.modules.sys.entity.SysUserEntity;
import com.spring.modules.test.entity.TestSoBom;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
@ -340,6 +341,10 @@ public class ProjectToolingApplyServiceImpl implements ProjectToolingApplyServic
} }
md.setFieldValue(oaIds.get(0).getId()); md.setFieldValue(oaIds.get(0).getId());
} }
} else if ("C".equals(nodeDetail.getFieldType())) { // 判断是否为金额
BigDecimal v = (BigDecimal) getPropertyValue(changeRequest, nodeDetail.getPlmField());
fieldValue = v == null ? "" : v.toString();
md.setFieldValue(fieldValue);
} else { } else {
md.setFieldValue(fieldValue); md.setFieldValue(fieldValue);
} }

2
src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml

@ -156,7 +156,7 @@ a.orderRef5,dbo.plm_get_toolDesc(a.site,a.tool_id) toolDesc,a.orderRef6,b.operat
step_id, step_id,
reject_flag, reject_flag,
reject_step_id reject_step_id
,tp,dbo.get_userDisPlay(tp) tpName ,quoter,dbo.get_userDisPlay(quoter) quoterName ,purchaser,dbo.get_userDisPlay(purchaser) purchaserName
,tp,dbo.get_userDisPlay(tp) tpName ,quoter,dbo.get_userDisPlay(quoter) quoterName ,purchaser,dbo.get_userDisPlay(purchaser) purchaserName,totalCost
FROM plm_project_tool_applyHeader FROM plm_project_tool_applyHeader
where site = #{site} and apply_no = #{applyNo} where site = #{site} and apply_no = #{applyNo}
</select> </select>

3
src/main/resources/mapper/change/ChangeManagementMapper.xml

@ -813,7 +813,8 @@
field_desc, field_desc,
workflow_id, workflow_id,
plm_table, plm_table,
field_type
field_type,
FROM plm_request_node_detail FROM plm_request_node_detail
WHERE site = #{site} and workflow_id = #{workflowId} and node_id = #{nodeId} and classification_no = #{classificationNo} WHERE site = #{site} and workflow_id = #{workflowId} and node_id = #{nodeId} and classification_no = #{classificationNo}
</select> </select>

Loading…
Cancel
Save