SOPHAL/ERP
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update qvm

Browse Source 
Track and comment
This commit is contained in:
zakaria.hachem
2024-12-08 10:01:52 +01:00
parent 408232e808
commit 8964202e78
3 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/axelor-open-suite/axelor-qvm/src/main/java/com.axelor/apps.qvm/service/QvmOperationServiceImpl.java
View File

@@ -65,10 +65,9 @@ public class QvmOperationServiceImpl implements QvmOperationService {
throw new AxelorException( throw new AxelorException(
company, company,
TraceBackRepository.CATEGORY_CONFIGURATION_ERROR, TraceBackRepository.CATEGORY_CONFIGURATION_ERROR,
I18n.get("IExceptionMessage.PURCHASE_ORDER_1"), I18n.get("Calibration Sequence is not defined"),
company.getName()); company.getName());
} }
System.out.println("seq before : " + seq);
return seq; return seq;
} }
@@ -78,10 +77,9 @@ public class QvmOperationServiceImpl implements QvmOperationService {
throw new AxelorException( throw new AxelorException(
company, company,
TraceBackRepository.CATEGORY_CONFIGURATION_ERROR, TraceBackRepository.CATEGORY_CONFIGURATION_ERROR,
I18n.get("IExceptionMessage.PURCHASE_ORDER_1"), I18n.get("Qualification Sequence is not defined"),
company.getName()); company.getName());
} }
System.out.println("seq before : " + seq);
return seq; return seq;
} }
@@ -91,10 +89,9 @@ public class QvmOperationServiceImpl implements QvmOperationService {
throw new AxelorException( throw new AxelorException(
company, company,
TraceBackRepository.CATEGORY_CONFIGURATION_ERROR, TraceBackRepository.CATEGORY_CONFIGURATION_ERROR,
I18n.get("IExceptionMessage.PURCHASE_ORDER_1"), I18n.get("Operation Sequence is not defined"),
company.getName()); company.getName());
} }
System.out.println("seq before : " + seq);
return seq; return seq;
} }

11
modules/axelor-open-suite/axelor-qvm/src/main/resources/domains/Machine.xml
View File

@@ -7,11 +7,16 @@
<entity name="Machine"> <entity name="Machine">
<one-to-many name="operationList" ref="com.axelor.apps.qvm.db.QvmOperation" mappedBy="machineName" title="Operations" /> <one-to-many name="operationList" ref="com.axelor.apps.qvm.db.QvmOperation" mappedBy="machineName" title="Operations" />
<many-to-one name="machineLocation" ref="com.axelor.apps.qvm.db.QvmMachineLocation" title="Machine Location" required="true"/> <many-to-one name="machineLocation" ref="com.axelor.apps.qvm.db.QvmMachineLocation" title="Machine Location"/>
<string name="model" title="Model"/> <string name="model" title="Model"/>
<string name="machineId" title="ID"/> <string name="machineId" title="ID"/>
<integer name="typeSelect" title="Type Select" default="0"/> <integer name="typeSelect" title="Type Select" default="0"/>
<integer name="machineOperationType" required="true" selection="operation.machine.type.status.select" default="1"/> <integer name="machineOperationType" selection="operation.machine.type.status.select" default="1"/>
<string name="remarque" title="Remarque"/> <string name="note" title="Note"/>
<string name="fullName" namecolumn="true">
<![CDATA[
return machineId+" "+name;
]]>
</string>
</entity> </entity>
</domain-models> </domain-models>

22
modules/axelor-open-suite/axelor-qvm/src/main/resources/domains/QvmOperation.xml
View File

@@ -41,25 +41,37 @@
<integer name="parentLocation" selection="operation.parent.location.select" default="0"/> <integer name="parentLocation" selection="operation.parent.location.select" default="0"/>
<track> <track>
<field name="createdOn"/>orderByState <field name="createdOn"/>
<field name="statusSelect"/> <field name="createdBy"/>
<field name="updatedOn"/>
<field name="updatedBy"/>
<field name="serialNumber"/>
<field name="operationType"/>
<field name="machineName"/> <field name="machineName"/>
<field name="machineId"/> <field name="machineId"/>
<field name="machineBrand"/> <field name="machineBrand"/>
<field name="machineModel"/> <field name="machineModel"/>
<field name="machineSerialNumber"/> <field name="machineSerialNumber"/>
<field name="machineLocalisation" /> <field name="machineLocalisation" />
<field name="machineLocalisationParent"/>
<field name="stockUnity"/>
<field name="fullRange"/> <field name="fullRange"/>
<field name="operationRange"/> <field name="operationRange"/>
<field name="leastCount"/> <field name="leastCount"/>
<field name="operationFrequency"/>
<field name="pastOperationDate"/>
<field name="operationDate"/> <field name="operationDate"/>
<field name="operationDueDate"/> <field name="operationDueDate"/>
<field name="countdown"/> <field name="countdown"/>
<field name="reportCertifiacteNumber"/> <field name="reportCertifiacteNumber"/>
<field name="external"/> <field name="externalInternal"/>
<field name="internal"/> <field name="statusSelect"/>
<field name="company"/>
<field name="typeSelect"/>
<field name="orderByState"/>
<field name="purchaseRequest"/>
<field name="parentLocation"/>
</track> </track>
</entity> </entity>
</domain-models> </domain-models>