Merge remote-tracking branch 'origin/master'

common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java

@@ -494,18 +494,20 @@ public class ProdReadyTaskServiceImpl extends ServiceImpl<ProdReadyTaskMapper, P
             }
             //下道工序
             Router router = routerService.getRouterBySfcBo(HandleEnum.SFC.getHandle(site, sfcServiceById.getSfc()));
-            int seq = 0;
+            if (router==null){
+                throw new BaseException("未找到当前工序");
+            }
             List<RouterStepDto> stepOperationList = routerStepService.findRouterOperationByRouterBo(site, router.getHandle());
+            StringBuilder operationDesc = new StringBuilder();
             for (int i = 0; i < stepOperationList.size(); i++) {
                 RouterStepDto stepOperation = stepOperationList.get(i);
-                if (stepOperation.getStepId().equals(prodReadyTask.getStepId())) {
+                operationDesc.append(stepOperation.getOperationDesc()) ;
-                    seq = i;
+                if (i!=stepOperationList.size()-1){
-                }
+                    operationDesc.append(",");
                 }
-            if (seq != stepOperationList.size() - 1) {
-                RouterStepDto stepOperation = stepOperationList.get(seq + 1);
-                labelPrintDto.setOperation(stepOperation.getOperationDesc());
             }
+            labelPrintDto.setOperation(operationDesc.toString());
+
             labelPrintDtoList.add(labelPrintDto);
             printData = JSON.toJSONString(labelPrintDtoList);
             //打印记录

equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceFaultReceiveServiceImpl.java

@@ -78,7 +78,7 @@ public class ResourceFaultReceiveServiceImpl extends ServiceImpl<ResourceFaultRe
         LocalDateTime sendDate = LocalDateTime.parse(sendTime, dataFormatter);
 
         String faultCode = jsonObject.getString("FAULT_CODE");
-        String description = jsonObject.getString("CONTENT");
+        String description = jsonObject.getString("ALARM_CONTENT");
 
         String dateTime = jsonObject.getString("DATE_TIME");
         LocalDateTime faultDate = LocalDateTime.parse(dateTime, dataFormatter);

integration/src/main/java/com/foreverwin/mesnac/integration/service/impl/InterfaceServiceImpl.java

@@ -74,9 +74,9 @@ public class InterfaceServiceImpl implements InterfaceService {
     public void itemSync(String site, ItemSyncRequest itemSyncRequest) throws Exception{
         //物料
         String item = itemSyncRequest.getITEM();
-        //版本:默认值A
+        //版本:MES物料只有一个版本：A
-        String revision = itemSyncRequest.getREVISION();
+        String revision = "A";
-        revision = StringUtil.notBlank(revision) ? revision : "A";
+        //revision = StringUtil.notBlank(revision) ? revision : "A";
         //物料描述
         String itemDescription = itemSyncRequest.getMAKTX();
         //计量单位

production/src/main/java/com/foreverwin/mesnac/production/service/impl/PodTemplateServiceImpl.java

@@ -356,7 +356,7 @@ public class PodTemplateServiceImpl implements PodTemplateService {
                 SfcDispatchDto sfcdispatch = new SfcDispatchDto();
                 sfcdispatch.setHandle(HandleEnum.SFC_DISPATCH.getHandle(site, dispatchNo));
                 sfcdispatch = sfcDispatchCommonService.findSfcDispatchBySfc(sfcdispatch);
-                sendErp(sfc, stepId, qty, BigDecimal.ZERO, sfcdispatch.getProdHours());
+                sendErp(sfc, stepId, qty, BigDecimal.ZERO, qty.multiply(sfcdispatch.getProdHours()));
             }
         } catch (Exception e) {
             ExceptionUtil.throwException(e);