CBR报工逻辑调整

modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesProductOffLineService.java

@@ -14,6 +14,9 @@ import java.util.List;
  **/
 public interface IMesProductOffLineService extends IBaseMesService<MesProductOffLine>{
 
-    @ApiOperation("查询报工数据")
+    @ApiOperation("根据汇报条码查询报工数据")
     List<MesProductOffLine> findMesProductOffLineByProductSn(String productSn, String organizeCode);
+
+    @ApiOperation("根据加工记录ID查询报工数据")
+    List<MesProductOffLine> findMesProductOffLineByRecordId(String recordId, String organizeCode);
 }

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProductOffLineServiceImpl.java

@@ -30,4 +30,15 @@ public class MesProductOffLineServiceImpl extends BaseMesService<MesProductOffLi
         DdlPreparedPack.getNumEqualPack(MesExtEnumUtil.REPORT_TYPE.REPORT.getValue(),"reportType",packBean);
         return baseRDao.findByHqlWhere(packBean);
     }
+
+    @Override
+    public List<MesProductOffLine> findMesProductOffLineByRecordId(String recordId, String organizeCode) {
+        if(StringUtil.isEmpty(recordId) || StringUtil.isEmpty(organizeCode)){
+            return null;
+        }
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
+        DdlPreparedPack.getStringEqualPack(recordId,"productionRecordId",packBean);
+        DdlPreparedPack.getNumEqualPack(MesExtEnumUtil.REPORT_TYPE.REPORT.getValue(),"reportType",packBean);
+        return baseRDao.findByHqlWhere(packBean);
+    }
 }

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java

@@ -1346,6 +1346,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
         if (CollectionUtils.isEmpty(oldProductOffLineList)) {
             MesException.throwMesBusiException("条码【%s】未查询到报工数据", model.getSn());
         }
+        oldProductOffLineList = mesProductOffLineService.findMesProductOffLineByRecordId(oldProductOffLineList.iterator().next().getProductionRecordId(), model.getOrganizeCode());
         oldProductOffLineList.forEach(item -> {
             item.setReportType(MesExtEnumUtil.REPORT_TYPE.CBR.getValue());
             item.setOrderNo(model.getShipOrderNo());