wilson
/
ccl-plm-java
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

添加parallelOperation 20260914 新增并行工序

master
Rui_Li 2 months ago
parent
35e2175617
commit
495a70eade
2 changed files with 11 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 15
      src/main/java/com/spring/ifs/api/RoutingApi.java
  2. 1
      src/main/java/com/spring/modules/part/entity/APIEntity/RoutingIfsItem.java

15
src/main/java/com/spring/ifs/api/RoutingApi.java
View File

@ -395,7 +395,7 @@ public class RoutingApi {
public static Map<String, String> getRoutingItem(Server srv, String ifsRowId, String ifsRowVersion) throws APException {
StringBuilder searchSql = new StringBuilder();
searchSql.append("SELECT OBJID ifsRowId, OBJVERSION ifsRowVersion, CONTRACT, PART_NO, ROUTING_REVISION, BOM_TYPE routingType,");
searchSql.append(" ALTERNATIVE_NO, OPERATION_NO, OPERATION_ID");
searchSql.append(" ALTERNATIVE_NO, OPERATION_NO, OPERATION_ID, PARALLEL_OPERATION");
searchSql.append(" FROM IFSAPP.ROUTING_OPERATION");
searchSql.append(" WHERE OBJID = :ifsRowId");
@ -425,7 +425,7 @@ public class RoutingApi {
String alternativeNo, String operationNo) throws APException {
StringBuilder searchSql = new StringBuilder();
searchSql.append("SELECT CONTRACT, PART_NO, ROUTING_REVISION, BOM_TYPE, ALTERNATIVE_NO,");
searchSql.append(" OPERATION_NO, OPERATION_DESCRIPTION operationDesc, WORK_CENTER_NO, EFFICIENCY_FACTOR, MACH_SETUP_TIME,");
searchSql.append(" OPERATION_NO, OPERATION_DESCRIPTION operationDesc, PARALLEL_OPERATION, WORK_CENTER_NO, EFFICIENCY_FACTOR, MACH_SETUP_TIME,");
searchSql.append(" MACH_RUN_FACTOR, RUN_TIME_CODE, LABOR_RUN_FACTOR, LABOR_SETUP_TIME, CREW_SIZE, SETUP_CREW_SIZE,");
searchSql.append(" OPERATION_ID, MACHINE_NO, OUTSIDE_OP_ITEM, LABOR_CLASS_NO, SETUP_LABOR_CLASS_NO,");
searchSql.append(" OVERLAP, NOTE_TEXT, objid ifsRowId, objversion ifsRowVersion");
@ -466,7 +466,7 @@ public class RoutingApi {
String alternativeNo, String operationNo) throws APException {
StringBuilder searchSql = new StringBuilder();
searchSql.append("SELECT CONTRACT, PART_NO, ROUTING_REVISION, BOM_TYPE, ALTERNATIVE_NO,");
searchSql.append(" OPERATION_NO, OPERATION_DESCRIPTION, WORK_CENTER_NO, EFFICIENCY_FACTOR, MACH_SETUP_TIME,");
searchSql.append(" OPERATION_NO, OPERATION_DESCRIPTION, PARALLEL_OPERATION, WORK_CENTER_NO, EFFICIENCY_FACTOR, MACH_SETUP_TIME,");
searchSql.append(" MACH_RUN_FACTOR, RUN_TIME_CODE, LABOR_RUN_FACTOR, LABOR_SETUP_TIME, CREW_SIZE, SETUP_CREW_SIZE,");
searchSql.append(" OPERATION_ID, MACHINE_NO, OUTSIDE_OP_ITEM, LABOR_CLASS_NO, SETUP_LABOR_CLASS_NO,");
searchSql.append(" OVERLAP, NOTE_TEXT, objid ifsRowId, objversion ifsRowVersion");
@ -507,6 +507,7 @@ public class RoutingApi {
tempItem.setContract(tempMap.get("CONTRACT"));
tempItem.setPartNo(tempMap.get("PART_NO"));
tempItem.setAlternativeNo(tempMap.get("ALTERNATIVE_NO"));
tempItem.setParallelOperation(tempMap.get("PARALLEL_OPERATION"));//20260914 新增字段
tempItem.setOperationNo(tempMap.get("OPERATION_NO"));
tempItem.setOperationDesc(tempMap.get("OPERATION_DESCRIPTION"));
tempItem.setWorkCenterNo(tempMap.get("WORK_CENTER_NO"));
@ -541,7 +542,7 @@ public class RoutingApi {
public static List<RoutingIfsItem> getRoutingItemsWithCopyPart(Server srv, String contract, String partNo) throws APException {
StringBuilder searchSql = new StringBuilder();
searchSql.append("SELECT CONTRACT, PART_NO, ROUTING_REVISION, BOM_TYPE, ALTERNATIVE_NO,");
searchSql.append(" OPERATION_NO, OPERATION_DESCRIPTION, WORK_CENTER_NO, EFFICIENCY_FACTOR, MACH_SETUP_TIME,");
searchSql.append(" OPERATION_NO, OPERATION_DESCRIPTION, PARALLEL_OPERATION, WORK_CENTER_NO, EFFICIENCY_FACTOR, MACH_SETUP_TIME,");
searchSql.append(" MACH_RUN_FACTOR, RUN_TIME_CODE, LABOR_RUN_FACTOR, LABOR_SETUP_TIME, CREW_SIZE, SETUP_CREW_SIZE,");
searchSql.append(" OPERATION_ID, MACHINE_NO, OUTSIDE_OP_ITEM, LABOR_CLASS_NO, SETUP_LABOR_CLASS_NO,");
searchSql.append(" OVERLAP, NOTE_TEXT, objid ifsRowId, objversion ifsRowVersion");
@ -572,6 +573,7 @@ public class RoutingApi {
tempItem.setRoutingType(tempMap.get("BOM_TYPE"));
tempItem.setAlternativeNo(tempMap.get("ALTERNATIVE_NO"));
tempItem.setOperationNo(tempMap.get("OPERATION_NO"));
tempItem.setParallelOperation(tempMap.get("PARALLEL_OPERATION"));
tempItem.setOperationDesc(tempMap.get("OPERATION_DESCRIPTION"));
tempItem.setWorkCenterNo(tempMap.get("WORK_CENTER_NO"));
tempItem.setEfficiencyFactor(tempMap.get("EFFICIENCY_FACTOR"));
@ -613,6 +615,7 @@ public class RoutingApi {
String alternativeNo = inData.getAlternativeNo();
String operationNo = inData.getOperationNo();
String operationDesc = inData.getOperationDesc();
String parallelOperation = inData.getParallelOperation();
String workCenterNo = inData.getWorkCenterNo();//
String efficiencyFactor = inData.getEfficiencyFactor();
String machSetupTime = inData.getMachSetupTime();
@ -641,6 +644,7 @@ public class RoutingApi {
inParam.put("ALTERNATIVE_NO", alternativeNo); // 替代编码
inParam.put("OPERATION_NO", operationNo); // 工序
inParam.put("OPERATION_DESCRIPTION", operationDesc); // 工序描述
inParam.put("PARALLEL_OPERATION", parallelOperation); // 并行工序 20260914 新增LR
inParam.put("LOT_QTY", "1"); // 默认值
inParam.put("WORK_CENTER_NO", workCenterNo); // 加工中心
inParam.put("MACHINE_NO", machineNo); // 机台
@ -661,7 +665,6 @@ public class RoutingApi {
// 固定的数值
inParam.put("FIXED_RESOURCE_SHARE", "1"); // 固定值
inParam.put("PARALLEL_OPERATION", "Not parallel"); // 固定值
inParam.put("MILESTONE_OPERATION_DB", "FALSE"); // 固定值
inParam.put("INCREASE_LOTSIZE_ON_SCRAP_DB", "FALSE"); // 固定值
inParam.put("OVERLAP_UNIT", "Units"); // 固定值
@ -695,6 +698,7 @@ public class RoutingApi {
String ifsRowVersion = inData.getIfsRowVersion();// 物料编码
String operationNo = inData.getOperationNo();
String operationDesc = inData.getOperationDesc();
String parallelOperation = inData.getParallelOperation();//20260914
String workCenterNo = inData.getWorkCenterNo();//
String efficiencyFactor = inData.getEfficiencyFactor();
String machSetupTime = inData.getMachSetupTime();
@ -717,6 +721,7 @@ public class RoutingApi {
inParam.put("OBJVERSION", ifsRowVersion);
inParam.put("OPERATION_NO", operationNo); // 工序
inParam.put("OPERATION_DESCRIPTION", operationDesc); // 工序描述
inParam.put("PARALLEL_OPERATION", parallelOperation); // 并行工序 20260914 新增LR
inParam.put("WORK_CENTER_NO", workCenterNo); // 加工中心
inParam.put("MACHINE_NO", machineNo); // 机台
inParam.put("EFFICIENCY_FACTOR", efficiencyFactor); // 效率

1
src/main/java/com/spring/modules/part/entity/APIEntity/RoutingIfsItem.java
View File

@ -114,6 +114,7 @@ public class RoutingIfsItem {
private String ifsRowVersion;
//2025-07-02 后加字段
private String ifsOperationId;
private String parallelOperation;//20260914 新增字段 LR
public RoutingIfsItem() {}

Write Preview
Loading…
Cancel
Save