组织模型新增设备过滤已绑定工位

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

@@ -29,10 +29,10 @@ public class MesEquipmentService extends BaseMesService<MesEquipment> implements
         if (!StringUtil.isEmpty(bean.getFilterWorkCell())) {
             //过滤已绑定工位
             DdlPackBean packBean1 = DdlPackBean.getDdlPackBean(bean.getOrganizeCode());
-            DdlPreparedPack.getIsNotNull("equipmentCode", packBean);
-            DdlPreparedPack.getIsNotNull( "workCellCode", packBean);
+            DdlPreparedPack.getIsNotNull("equipmentCode", packBean1);
+            DdlPreparedPack.getIsNotNull( "workCellCode", packBean1);
 
-            List<MesWcEquipment> workCells = mesWcEquipmentRepository.findByHqlWhere(packBean);
+            List<MesWcEquipment> workCells = mesWcEquipmentRepository.findByHqlWhere(packBean1);
             DdlPreparedPack.getNotInPack(workCells.stream().map(MesWcEquipment::getEquipmentCode), "equipmentCode", packBean);
         }
         DdlPreparedPack.getStringEqualPack(bean.getEquipmentCode(), "equipmentCode", packBean);